diff --git a/NumericalData/AMDA/ACE/MFI/ace-imf-all.xml b/NumericalData/AMDA/ACE/MFI/ace-imf-all.xml
index e834064..6149f76 100644
--- a/NumericalData/AMDA/ACE/MFI/ace-imf-all.xml
+++ b/NumericalData/AMDA/ACE/MFI/ace-imf-all.xml
@@ -63,7 +63,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1997-09-02T00:00:12Z</StartDate>
-             <StopDate>2017-08-12T23:59:47Z</StopDate>
+             <StopDate>2017-09-23T23:59:56Z</StopDate>
          </TimeSpan>
          <Cadence>PT16S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml b/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml
index e27f479..9fd5969 100644
--- a/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml
+++ b/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml
@@ -53,7 +53,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-01-06T00:00:00Z</StartDate>
-             <StopDate>2017-08-21T00:59:59Z</StopDate>
+             <StopDate>2017-10-05T00:59:59Z</StopDate>
          </TimeSpan>
          <Cadence>PT60S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/ACE/SWEPAM/ace-swe-all.xml b/NumericalData/AMDA/ACE/SWEPAM/ace-swe-all.xml
index fb59065..c4a7fa8 100644
--- a/NumericalData/AMDA/ACE/SWEPAM/ace-swe-all.xml
+++ b/NumericalData/AMDA/ACE/SWEPAM/ace-swe-all.xml
@@ -61,7 +61,7 @@
    <TemporalDescription>
       <TimeSpan>
          <StartDate>1998-02-04T00:00:31Z</StartDate>
-         <StopDate>2017-01-20T23:59:42Z</StopDate>
+         <StopDate>2017-07-01T23:59:15Z</StopDate>
      </TimeSpan>
      <Cadence>PT64S</Cadence>
    </TemporalDescription>
diff --git a/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml b/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml
index 6f44443..2fbcd17 100644
--- a/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml
+++ b/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml
@@ -48,7 +48,7 @@
    <TemporalDescription>
       <TimeSpan>
          <StartDate>2014-01-06T00:00:00Z</StartDate>
-         <StopDate>2017-08-21T00:59:59Z</StopDate>
+         <StopDate>2017-10-05T00:59:59Z</StopDate>
      </TimeSpan>
      <Cadence>PT60S</Cadence>
    </TemporalDescription>
diff --git a/NumericalData/AMDA/ACE/SWEPAM/ace-swp-all.xml b/NumericalData/AMDA/ACE/SWEPAM/ace-swp-all.xml
index fb33777..f3fb78c 100644
--- a/NumericalData/AMDA/ACE/SWEPAM/ace-swp-all.xml
+++ b/NumericalData/AMDA/ACE/SWEPAM/ace-swp-all.xml
@@ -61,7 +61,7 @@
    <TemporalDescription>
       <TimeSpan>
          <StartDate>2001-01-01T00:00:00Z</StartDate>
-         <StopDate>2017-08-12T23:55:00Z</StopDate>
+         <StopDate>2017-09-23T23:55:00Z</StopDate>
      </TimeSpan>
      <Cadence>PT5M</Cadence>
    </TemporalDescription>
diff --git a/NumericalData/AMDA/Cassini/RPWS/cass-rpws-skr.xml b/NumericalData/AMDA/Cassini/RPWS/cass-rpws-skr.xml
index 616b942..e6f370e 100644
--- a/NumericalData/AMDA/Cassini/RPWS/cass-rpws-skr.xml
+++ b/NumericalData/AMDA/Cassini/RPWS/cass-rpws-skr.xml
@@ -33,7 +33,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2003-01-01T00:00:00Z</StartDate>
-                <StopDate>2015-04-29T23:59:59Z</StopDate>                
+                <StopDate>2017-09-15T23:59:59Z</StopDate>                
             </TimeSpan>
             <Cadence>PT180S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cassini/RPWS/cass-rpws-titan.xml b/NumericalData/AMDA/Cassini/RPWS/cass-rpws-titan.xml
index 088da26..6d908f1 100644
--- a/NumericalData/AMDA/Cassini/RPWS/cass-rpws-titan.xml
+++ b/NumericalData/AMDA/Cassini/RPWS/cass-rpws-titan.xml
@@ -14,7 +14,7 @@
             SCPOT : spacecraft potential in volts
             T : electron temperature in electron volts</Description>
             <Contact>
-                <PersonID></PersonID>
+                <PersonID/>
                 <Role>TechnicalContact</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/AMDA/Cassini/RPWS/cass-rpws-ui.xml b/NumericalData/AMDA/Cassini/RPWS/cass-rpws-ui.xml
index 4b8cd75..7077d88 100644
--- a/NumericalData/AMDA/Cassini/RPWS/cass-rpws-ui.xml
+++ b/NumericalData/AMDA/Cassini/RPWS/cass-rpws-ui.xml
@@ -34,7 +34,7 @@
         </AccessInformation>
         <ProviderName>PDS</ProviderName>
         <InstrumentID>spase://CDPP/Instrument/AMDA/Cassini/RPWS</InstrumentID>
-        <MeasurementType></MeasurementType>
+        <MeasurementType/>
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>1997-10-25T00:09:18Z</StartDate>
diff --git a/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml b/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml
index 3843277..fa14172 100644
--- a/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml
+++ b/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml
@@ -63,7 +63,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:06Z</StartDate>
-                <StopDate>2015-01-31T23:59:58Z</StopDate>
+                <StopDate>2015-10-31T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-ppp.xml b/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-ppp.xml
index 181e8c2..04f4ace 100644
--- a/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-ppp.xml
+++ b/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-ppp.xml
@@ -47,7 +47,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-01T00:00:02Z</StartDate>
-                <StopDate>2012-12-31T23:59:54Z</StopDate>
+                <StopDate>2015-02-28T23:59:54Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml b/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml
index 7dabd3b..03faa1a 100644
--- a/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml
+++ b/NumericalData/AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml
@@ -60,7 +60,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:06Z</StartDate>
-                <StopDate>2015-01-31T23:59:58Z</StopDate>
+                <StopDate>2015-10-31T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster1/FGM/clust1-fgm-high.xml b/NumericalData/AMDA/Cluster/Cluster1/FGM/clust1-fgm-high.xml
index f74bd1d..abbd0a8 100644
--- a/NumericalData/AMDA/Cluster/Cluster1/FGM/clust1-fgm-high.xml
+++ b/NumericalData/AMDA/Cluster/Cluster1/FGM/clust1-fgm-high.xml
@@ -44,7 +44,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-07T05:14:25Z</StartDate>
-                <StopDate>2015-05-02T15:08:13Z</StopDate>
+                <StopDate>2017-05-02T03:44:12Z</StopDate>
             </TimeSpan>
             <Cadence>PT0.2S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster1/FGM/clust1-fgm-prp.xml b/NumericalData/AMDA/Cluster/Cluster1/FGM/clust1-fgm-prp.xml
index b1fbd53..5b0a4d9 100644
--- a/NumericalData/AMDA/Cluster/Cluster1/FGM/clust1-fgm-prp.xml
+++ b/NumericalData/AMDA/Cluster/Cluster1/FGM/clust1-fgm-prp.xml
@@ -44,7 +44,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-07T05:14:29Z</StartDate>
-                <StopDate>2013-05-02T03:39:16Z</StopDate>
+                <StopDate>2017-05-02T03:44:10Z</StopDate>
             </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml b/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml
index 5c8e839..045453a 100644
--- a/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml
+++ b/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml
@@ -64,7 +64,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:02Z</StartDate>
-                <StopDate>2015-01-31T23:59:58Z</StopDate>
+                <StopDate>2015-10-31T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-ppp.xml b/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-ppp.xml
index 78ba759..5bcf551 100644
--- a/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-ppp.xml
+++ b/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-ppp.xml
@@ -47,7 +47,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-01T00:00:06Z</StartDate>
-                <StopDate>2012-12-31T23:59:54Z</StopDate>
+                <StopDate>2015-02-28T23:59:54Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml b/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml
index e2da207..218869d 100644
--- a/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml
+++ b/NumericalData/AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml
@@ -60,7 +60,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:02Z</StartDate>
-                <StopDate>2015-01-31T23:59:58Z</StopDate>
+                <StopDate>2015-10-31T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster2/FGM/clust2-fgm-high.xml b/NumericalData/AMDA/Cluster/Cluster2/FGM/clust2-fgm-high.xml
index 9fcdc08..0070372 100644
--- a/NumericalData/AMDA/Cluster/Cluster2/FGM/clust2-fgm-high.xml
+++ b/NumericalData/AMDA/Cluster/Cluster2/FGM/clust2-fgm-high.xml
@@ -44,7 +44,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-07T06:14:55Z</StartDate>
-                <StopDate>2015-05-02T15:08:13Z</StopDate>
+                <StopDate>2017-05-02T03:44:12Z</StopDate>
             </TimeSpan>
             <Cadence>PT0.2S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster2/FGM/clust2-fgm-prp.xml b/NumericalData/AMDA/Cluster/Cluster2/FGM/clust2-fgm-prp.xml
index 08249d3..994b9fa 100644
--- a/NumericalData/AMDA/Cluster/Cluster2/FGM/clust2-fgm-prp.xml
+++ b/NumericalData/AMDA/Cluster/Cluster2/FGM/clust2-fgm-prp.xml
@@ -44,7 +44,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-07T06:15:01Z</StartDate>
-                <StopDate>2013-05-02T03:39:19Z</StopDate>
+                <StopDate>2017-05-02T03:44:09Z</StopDate>
             </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-ppp.xml b/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-ppp.xml
index 5e83788..68645d8 100644
--- a/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-ppp.xml
+++ b/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-ppp.xml
@@ -47,7 +47,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-01T00:00:02Z</StartDate>
-                <StopDate>2012-12-31T23:59:58Z</StopDate>
+                <StopDate>2015-02-28T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml b/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml
index 9ef2e81..3761dc5 100644
--- a/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml
+++ b/NumericalData/AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml
@@ -67,7 +67,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:02Z</StartDate>
-                <StopDate>2014-07-31T10:43:58Z</StopDate>
+                <StopDate>2014-11-03T20:58:14Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster3/FGM/clust3-fgm-high.xml b/NumericalData/AMDA/Cluster/Cluster3/FGM/clust3-fgm-high.xml
index befc379..90f599a 100644
--- a/NumericalData/AMDA/Cluster/Cluster3/FGM/clust3-fgm-high.xml
+++ b/NumericalData/AMDA/Cluster/Cluster3/FGM/clust3-fgm-high.xml
@@ -44,7 +44,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-07T00:10:02Z</StartDate>
-                <StopDate>2015-05-02T15:08:13Z</StopDate>
+                <StopDate>2017-05-02T03:44:12Z</StopDate>
             </TimeSpan>
             <Cadence>PT0.2S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster3/FGM/clust3-fgm-prp.xml b/NumericalData/AMDA/Cluster/Cluster3/FGM/clust3-fgm-prp.xml
index 8e22e6a..2b03e72 100644
--- a/NumericalData/AMDA/Cluster/Cluster3/FGM/clust3-fgm-prp.xml
+++ b/NumericalData/AMDA/Cluster/Cluster3/FGM/clust3-fgm-prp.xml
@@ -44,7 +44,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-07T00:10:07Z</StartDate>
-                <StopDate>2013-05-02T03:39:17Z</StopDate>
+                <StopDate>2017-05-02T03:44:06Z</StopDate>
             </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml b/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml
index 5481c42..c94736f 100644
--- a/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml
+++ b/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml
@@ -65,7 +65,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:02Z</StartDate>
-                <StopDate>2015-01-31T23:59:58Z</StopDate>
+                <StopDate>2015-10-31T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-ppp.xml b/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-ppp.xml
index b80c741..58f7182 100644
--- a/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-ppp.xml
+++ b/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-ppp.xml
@@ -47,7 +47,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-01T00:00:02Z</StartDate>
-                <StopDate>2012-12-31T23:59:54Z</StopDate>
+                <StopDate>2015-02-28T23:59:54Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-sr2.xml b/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-sr2.xml
index 5f9550d..69fa64a 100644
--- a/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-sr2.xml
+++ b/NumericalData/AMDA/Cluster/Cluster4/EFW/clust4-efw-sr2.xml
@@ -60,7 +60,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-02-01T00:00:02Z</StartDate>
-                <StopDate>2015-01-31T23:59:58Z</StopDate>
+                <StopDate>2015-10-31T23:59:58Z</StopDate>
              </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster4/FGM/clust4-fgm-high.xml b/NumericalData/AMDA/Cluster/Cluster4/FGM/clust4-fgm-high.xml
index df1ca80..1cfda8b 100644
--- a/NumericalData/AMDA/Cluster/Cluster4/FGM/clust4-fgm-high.xml
+++ b/NumericalData/AMDA/Cluster/Cluster4/FGM/clust4-fgm-high.xml
@@ -44,7 +44,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-07T00:15:19Z</StartDate>
-                <StopDate>2015-05-02T15:08:13Z</StopDate>
+                <StopDate>2017-05-02T03:44:12Z</StopDate>
             </TimeSpan>
             <Cadence>PT0.2S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster4/FGM/clust4-fgm-prp.xml b/NumericalData/AMDA/Cluster/Cluster4/FGM/clust4-fgm-prp.xml
index 1e43349..96ac1c2 100644
--- a/NumericalData/AMDA/Cluster/Cluster4/FGM/clust4-fgm-prp.xml
+++ b/NumericalData/AMDA/Cluster/Cluster4/FGM/clust4-fgm-prp.xml
@@ -44,7 +44,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-07T00:15:21Z</StartDate>
-                <StopDate>2013-05-02T03:39:17Z</StopDate>
+                <StopDate>2017-05-02T03:44:08Z</StopDate>
             </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/DSCOVR/Ephemeris/dsc-orb-all.xml b/NumericalData/AMDA/DSCOVR/Ephemeris/dsc-orb-all.xml
index c53bc3f..2cb3ec2 100644
--- a/NumericalData/AMDA/DSCOVR/Ephemeris/dsc-orb-all.xml
+++ b/NumericalData/AMDA/DSCOVR/Ephemeris/dsc-orb-all.xml
@@ -32,8 +32,8 @@
         <MeasurementType>Ephemeris</MeasurementType>
         <TemporalDescription>
             <TimeSpan>
-                <StartDate>1997-08-26T00:00:00Z</StartDate>
-                <StopDate>2017-04-24T23:47:00Z</StopDate>
+                <StartDate>2016-08-01T00:00:00Z</StartDate>
+                <StopDate>2017-10-05T23:00:00Z</StopDate>
             </TimeSpan>
             <Cadence>PT1H</Cadence>
          </TemporalDescription>            
@@ -59,7 +59,7 @@
                     <ParameterKey>dsc_xyz_gse(0)</ParameterKey>
                     <ValidMin>-1594535.0</ValidMin>
                     <ValidMax>1594535.0</ValidMax>
-                    <FillValue>-99999.</FillValue>
+                    <FillValue>-99999</FillValue>
                 </Element>
                 <Element>
                     <Name>y</Name>
@@ -68,7 +68,7 @@
                     <ParameterKey>dsc_xyz_gse(1)</ParameterKey>
                     <ValidMin>-1594535.0</ValidMin>
                     <ValidMax>1594535.0</ValidMax>
-                    <FillValue>-99999.</FillValue>
+                    <FillValue>-99999</FillValue>
                 </Element>
                 <Element>
                     <Name>z</Name>
@@ -77,12 +77,67 @@
                     <ParameterKey>dsc_xyz_gse(2)</ParameterKey>
                     <ValidMin>-1594535.0</ValidMin>
                     <ValidMax>1594535.0</ValidMax>
-                    <FillValue>-99999.</FillValue>
+                    <FillValue>-99999</FillValue>
                 </Element>
             </Structure>
             <Support>
                 <SupportQuantity>Positional</SupportQuantity>
             </Support>
-        </Parameter>                        
+        </Parameter>  
+        <Parameter>
+            <Name>xyz_gsm</Name>
+            <ParameterKey>dsc_xyz_gsm</ParameterKey>
+            <Description>Spacecraft position in GSM</Description>
+            <Ucd>pos.earth;instr.obsty</Ucd>
+            <Units>Re</Units>
+            <CoordinateSystem>
+                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
+                <CoordinateSystemName>GSE</CoordinateSystemName>
+            </CoordinateSystem>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size>3</Size>
+                <Element>
+                    <Name>x</Name>
+                    <Qualifier>Component.I</Qualifier>
+                    <Index>1</Index>
+                    <ParameterKey>dsc_xyz_gsm(0)</ParameterKey>
+                    <ValidMin>-1594535.0</ValidMin>
+                    <ValidMax>1594535.0</ValidMax>
+                    <FillValue>-99999</FillValue>
+                </Element>
+                <Element>
+                    <Name>y</Name>
+                    <Qualifier>Component.J</Qualifier>
+                    <Index>2</Index>
+                    <ParameterKey>dsc_xyz_gsm(1)</ParameterKey>
+                    <ValidMin>-1594535.0</ValidMin>
+                    <ValidMax>1594535.0</ValidMax>
+                    <FillValue>-99999</FillValue>
+                </Element>
+                <Element>
+                    <Name>z</Name>
+                    <Qualifier>Component.K</Qualifier>
+                    <Index>3</Index>
+                    <ParameterKey>dsc_xyz_gsm(2)</ParameterKey>
+                    <ValidMin>-1594535.0</ValidMin>
+                    <ValidMax>1594535.0</ValidMax>
+                    <FillValue>-99999</FillValue>
+                </Element>
+            </Structure>
+            <Support>
+                <SupportQuantity>Positional</SupportQuantity>
+            </Support>
+        </Parameter>
+       <Parameter>
+            <Name>distance dscovr-earth</Name>
+            <ParameterKey>dsc_r</ParameterKey>
+            <Units>Re</Units>
+            <Support>
+                <SupportQuantity>Positional</SupportQuantity>
+            </Support>
+        </Parameter>                                                                      
     </NumericalData>
 </Spase>
diff --git a/NumericalData/AMDA/DSCOVR/FC/dsc-fc-1m.xml b/NumericalData/AMDA/DSCOVR/FC/dsc-fc-1m.xml
index 952f9d2..cc4bb58 100644
--- a/NumericalData/AMDA/DSCOVR/FC/dsc-fc-1m.xml
+++ b/NumericalData/AMDA/DSCOVR/FC/dsc-fc-1m.xml
@@ -5,7 +5,7 @@
       <ResourceID>spase://CDPP/NumericalData/AMDA/DSCVOR/FC/dsc-fc-1m</ResourceID>
       <ResourceHeader>
           <ResourceName>sw : 1 m</ResourceName>
-          <AlternateName>solar wind</AlternateName>      
+          <AlternateName>solar wind parameters</AlternateName>      
           <ReleaseDate>2017-10-16T15:10:29Z</ReleaseDate>
          <Description>Faraday Cup (FC)  measures the solar wind bulk properties (wind speed, density and temperature)</Description>
          <Acknowledgement>NOAA Space Weather Prediction Center (2016): Deep Space Climate Observatory (DSCOVR). NOAA National Centers for Environmental Information.</Acknowledgement>
@@ -21,7 +21,7 @@
          <InformationURL>
            <Name>Data description</Name>
            <URL>http://doi.org/10.7289/V51Z42F7</URL>
-           <Description></Description>
+           <Description/>
          </InformationURL>
       </ResourceHeader>
       <AccessInformation>
@@ -42,24 +42,24 @@
       <MeasurementType>MagneticField</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
-            <StartDate>1997-09-02T00:00:12Z</StartDate>
-             <StopDate>2017-08-12T23:59:47Z</StopDate>
+            <StartDate>2016-08-01T00:00:00Z</StartDate>
+             <StopDate>2017-10-05T23:59:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT60S</Cadence>
       </TemporalDescription>
       <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
-      <Caveats></Caveats>
+      <Caveats/>
         <Parameter>
          <Name>proton density</Name>
          <ParameterKey>dsc_npr</ParameterKey>
-         <Description></Description>
-         <Ucd></Ucd>
+         <Description/>
+         <Ucd/>
          <Units>cm^-3</Units>
          <RenderingHints>
               <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
-         <ValidMin></ValidMin>
-         <ValidMax></ValidMax>
+         <ValidMin/>
+         <ValidMax/>
          <FillValue>-99999.</FillValue>
          <Particle>
             <ParticleType>Proton</ParticleType>
@@ -69,14 +69,14 @@
        <Parameter>
          <Name>proton temperature</Name>
          <ParameterKey>dsc_tpr</ParameterKey>
-         <Description></Description>
-         <Ucd></Ucd>
+         <Description/>
+         <Ucd/>
          <Units>eV</Units>
          <RenderingHints>
               <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
-         <ValidMin></ValidMin>
-         <ValidMax></ValidMax>
+         <ValidMin/>
+         <ValidMax/>
          <FillValue>-99999.</FillValue>
          <Particle>
             <ParticleType>Proton</ParticleType>
@@ -86,14 +86,14 @@
       <Parameter>
          <Name>proton |v|</Name>
          <ParameterKey>dsc_vpr</ParameterKey>
-         <Description></Description>
-         <Ucd></Ucd>
+         <Description/>
+         <Ucd/>
          <Units>km/s</Units>
          <RenderingHints>
               <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
-         <ValidMin></ValidMin>
-         <ValidMax></ValidMax>
+         <ValidMin/>
+         <ValidMax/>
          <FillValue>-99999.</FillValue>
          <Particle>
             <ParticleType>Proton</ParticleType>
@@ -103,8 +103,8 @@
        <Parameter>
          <Name>proton v_gse</Name>
          <ParameterKey>dsc_vpr_gse</ParameterKey>
-         <Description></Description>
-         <Ucd></Ucd>
+         <Description/>
+         <Ucd/>
          <Units>km/s</Units>        
          <CoordinateSystem>
             <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
@@ -120,8 +120,8 @@
                 <Qualifier>Component.I</Qualifier>
                 <Index>1</Index>
                 <ParameterKey>dsc_vpr_gse(0)</ParameterKey>                
-                <ValidMin></ValidMin>
-                <ValidMax></ValidMax>
+                <ValidMin/>
+                <ValidMax/>
                 <FillValue>-99999.</FillValue>            
             </Element>
             <Element>
@@ -129,8 +129,8 @@
                 <Qualifier>Component.J</Qualifier>
                 <Index>2</Index>
                 <ParameterKey>dsc_vpr_gse(1)</ParameterKey>      
-                <ValidMin></ValidMin>
-                <ValidMax></ValidMax>
+                <ValidMin/>
+                <ValidMax/>
                 <FillValue>-99999.</FillValue>
             </Element>
             <Element>
@@ -138,8 +138,8 @@
                 <Qualifier>Component.K</Qualifier>
                 <Index>3</Index>
                 <ParameterKey>dsc_vpr_gse(2)</ParameterKey> 
-                <ValidMin></ValidMin>
-                <ValidMax></ValidMax>
+                <ValidMin/>
+                <ValidMax/>
                 <FillValue>-99999.</FillValue>
             </Element>
          </Structure>
@@ -151,8 +151,8 @@
        <Parameter>
          <Name>proton v_gsm</Name>
          <ParameterKey>dsc_vpr_gsm</ParameterKey>
-         <Description></Description>
-         <Ucd></Ucd>
+         <Description/>
+         <Ucd/>
          <Units>km/s</Units>        
          <CoordinateSystem>
             <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
@@ -168,8 +168,8 @@
                 <Qualifier>Component.I</Qualifier>
                 <Index>1</Index>
                 <ParameterKey>dsc_vpr_gsm(0)</ParameterKey>                
-                <ValidMin></ValidMin>
-                <ValidMax></ValidMax>
+                <ValidMin/>
+                <ValidMax/>
                 <FillValue>-99999.</FillValue>            
             </Element>
             <Element>
@@ -177,8 +177,8 @@
                 <Qualifier>Component.J</Qualifier>
                 <Index>2</Index>
                 <ParameterKey>dsc_vpr_gsm(1)</ParameterKey>      
-                <ValidMin></ValidMin>
-                <ValidMax></ValidMax>
+                <ValidMin/>
+                <ValidMax/>
                 <FillValue>-99999.</FillValue>
             </Element>
             <Element>
@@ -186,8 +186,8 @@
                 <Qualifier>Component.K</Qualifier>
                 <Index>3</Index>
                 <ParameterKey>dsc_vpr_gsm(2)</ParameterKey> 
-                <ValidMin></ValidMin>
-                <ValidMax></ValidMax>
+                <ValidMin/>
+                <ValidMax/>
                 <FillValue>-99999.</FillValue>
             </Element>
          </Structure>
diff --git a/NumericalData/AMDA/DSCOVR/FC/dsc-fc-3s.xml b/NumericalData/AMDA/DSCOVR/FC/dsc-fc-3s.xml
index 77206a9..933a3aa 100644
--- a/NumericalData/AMDA/DSCOVR/FC/dsc-fc-3s.xml
+++ b/NumericalData/AMDA/DSCOVR/FC/dsc-fc-3s.xml
@@ -5,7 +5,7 @@
       <ResourceID>spase://CDPP/NumericalData/AMDA/DSCVOR/FC/dsc-fc-1m</ResourceID>
       <ResourceHeader>
           <ResourceName>sw : 3 s</ResourceName>
-          <AlternateName>solar wind</AlternateName>      
+          <AlternateName>solar wind parameters</AlternateName>      
           <ReleaseDate>2017-10-16T15:10:29Z</ReleaseDate>
          <Description>Faraday Cup (FC)  measures the solar wind bulk properties (wind speed, density and temperature)</Description>
          <Acknowledgement>NOAA Space Weather Prediction Center (2016): Deep Space Climate Observatory (DSCOVR). NOAA National Centers for Environmental Information.</Acknowledgement>          
@@ -21,7 +21,7 @@
          <InformationURL>
            <Name>Data description</Name>
            <URL>http://doi.org/10.7289/V51Z42F7</URL>
-           <Description></Description>
+           <Description/>
          </InformationURL>
       </ResourceHeader>
       <AccessInformation>
@@ -42,24 +42,24 @@
       <MeasurementType>MagneticField</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
-            <StartDate>1997-09-02T00:00:12Z</StartDate>
-             <StopDate>2017-08-12T23:59:47Z</StopDate>
+            <StartDate>2016-08-01T00:00:00Z</StartDate>
+             <StopDate>2017-10-05T23:59:40Z</StopDate>
          </TimeSpan>
          <Cadence>PT3S</Cadence>
       </TemporalDescription>
       <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
-      <Caveats></Caveats>
+      <Caveats/>
         <Parameter>
          <Name>proton density</Name>
          <ParameterKey>dsc_npr_3s</ParameterKey>
-         <Description></Description>
-         <Ucd></Ucd>
+         <Description/>
+         <Ucd/>
          <Units>cm^-3</Units>
          <RenderingHints>
               <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
-         <ValidMin></ValidMin>
-         <ValidMax></ValidMax>
+         <ValidMin/>
+         <ValidMax/>
          <FillValue>-99999.</FillValue>
          <Particle>
             <ParticleType>Proton</ParticleType>
@@ -69,14 +69,14 @@
        <Parameter>
          <Name>proton temperature</Name>
          <ParameterKey>dsc_tpr_3s</ParameterKey>
-         <Description></Description>
-         <Ucd></Ucd>
+         <Description/>
+         <Ucd/>
          <Units>eV</Units>
          <RenderingHints>
               <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
-         <ValidMin></ValidMin>
-         <ValidMax></ValidMax>
+         <ValidMin/>
+         <ValidMax/>
          <FillValue>-99999.</FillValue>
          <Particle>
             <ParticleType>Proton</ParticleType>
@@ -86,14 +86,14 @@
       <Parameter>
          <Name>proton |v|</Name>
          <ParameterKey>dsc_vpr_3s</ParameterKey>
-         <Description></Description>
-         <Ucd></Ucd>
+         <Description/>
+         <Ucd/>
          <Units>km/s</Units>
          <RenderingHints>
               <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
-         <ValidMin></ValidMin>
-         <ValidMax></ValidMax>
+         <ValidMin/>
+         <ValidMax/>
          <FillValue>-99999.</FillValue>
          <Particle>
             <ParticleType>Proton</ParticleType>
@@ -103,8 +103,8 @@
        <Parameter>
          <Name>proton v_gse</Name>
          <ParameterKey>dsc_vpr_3s_gse</ParameterKey>
-         <Description></Description>
-         <Ucd></Ucd>
+         <Description/>
+         <Ucd/>
          <Units>km/s</Units>        
          <CoordinateSystem>
             <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
@@ -120,8 +120,8 @@
                 <Qualifier>Component.I</Qualifier>
                 <Index>1</Index>
                 <ParameterKey>dsc_vpr_3s_gse(0)</ParameterKey>                
-                <ValidMin></ValidMin>
-                <ValidMax></ValidMax>
+                <ValidMin/>
+                <ValidMax/>
                 <FillValue>-99999.</FillValue>            
             </Element>
             <Element>
@@ -129,8 +129,8 @@
                 <Qualifier>Component.J</Qualifier>
                 <Index>2</Index>
                 <ParameterKey>dsc_vpr_3s_gse(1)</ParameterKey>      
-                <ValidMin></ValidMin>
-                <ValidMax></ValidMax>
+                <ValidMin/>
+                <ValidMax/>
                 <FillValue>-99999.</FillValue>
             </Element>
             <Element>
@@ -138,8 +138,8 @@
                 <Qualifier>Component.K</Qualifier>
                 <Index>3</Index>
                 <ParameterKey>dsc_vpr_3s_gse(2)</ParameterKey> 
-                <ValidMin></ValidMin>
-                <ValidMax></ValidMax>
+                <ValidMin/>
+                <ValidMax/>
                 <FillValue>-99999.</FillValue>
             </Element>
          </Structure>
@@ -151,8 +151,8 @@
        <Parameter>
          <Name>proton v_gsm</Name>
          <ParameterKey>dsc_vpr_3s_gsm</ParameterKey>
-         <Description></Description>
-         <Ucd></Ucd>
+         <Description/>
+         <Ucd/>
          <Units>km/s</Units>        
          <CoordinateSystem>
             <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
@@ -168,8 +168,8 @@
                 <Qualifier>Component.I</Qualifier>
                 <Index>1</Index>
                 <ParameterKey>dsc_vpr_3s_gsm(0)</ParameterKey>                
-                <ValidMin></ValidMin>
-                <ValidMax></ValidMax>
+                <ValidMin/>
+                <ValidMax/>
                 <FillValue>-99999.</FillValue>            
             </Element>
             <Element>
@@ -177,8 +177,8 @@
                 <Qualifier>Component.J</Qualifier>
                 <Index>2</Index>
                 <ParameterKey>dsc_vpr_3s_gsm(1)</ParameterKey>      
-                <ValidMin></ValidMin>
-                <ValidMax></ValidMax>
+                <ValidMin/>
+                <ValidMax/>
                 <FillValue>-99999.</FillValue>
             </Element>
             <Element>
@@ -186,8 +186,8 @@
                 <Qualifier>Component.K</Qualifier>
                 <Index>3</Index>
                 <ParameterKey>dsc_vpr_3s_gsm(2)</ParameterKey> 
-                <ValidMin></ValidMin>
-                <ValidMax></ValidMax>
+                <ValidMin/>
+                <ValidMax/>
                 <FillValue>-99999.</FillValue>
             </Element>
          </Structure>
diff --git a/NumericalData/AMDA/DSCOVR/MAG/dsc-mag-1m.xml b/NumericalData/AMDA/DSCOVR/MAG/dsc-mag-1m.xml
index 54a8668..5e98c44 100644
--- a/NumericalData/AMDA/DSCOVR/MAG/dsc-mag-1m.xml
+++ b/NumericalData/AMDA/DSCOVR/MAG/dsc-mag-1m.xml
@@ -42,13 +42,13 @@
       <MeasurementType>MagneticField</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
-            <StartDate>1997-09-02T00:00:12Z</StartDate>
-             <StopDate>2017-08-12T23:59:47Z</StopDate>
+            <StartDate>2016-08-01T00:00:00Z</StartDate>
+             <StopDate>2017-10-05T23:59:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT60S</Cadence>
       </TemporalDescription>
       <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
-      <Caveats></Caveats>
+      <Caveats/>
       <Parameter>
          <Name>|b|</Name>
          <ParameterKey>dsc_b_mag</ParameterKey>
diff --git a/NumericalData/AMDA/DSCOVR/MAG/dsc-mag-1s.xml b/NumericalData/AMDA/DSCOVR/MAG/dsc-mag-1s.xml
index 52e7e97..31cb24e 100644
--- a/NumericalData/AMDA/DSCOVR/MAG/dsc-mag-1s.xml
+++ b/NumericalData/AMDA/DSCOVR/MAG/dsc-mag-1s.xml
@@ -7,7 +7,7 @@
           <ResourceName>1 s</ResourceName>
           <AlternateName>interplanetary magnetic field</AlternateName>      
           <ReleaseDate>2017-10-16T15:10:29Z</ReleaseDate>
-          <Description></Description>
+          <Description/>
           <Acknowledgement>NOAA Space Weather Prediction Center (2016): Deep Space Climate Observatory (DSCOVR). NOAA National Centers for Environmental Information.</Acknowledgement>
            <Contact>
                 <PersonID>spase://SMWG/Person/Adam.Szabo</PersonID>
@@ -20,7 +20,7 @@
           <InformationURL>
               <Name>Data description</Name>
               <URL>http://doi.org/10.7289/V51Z42F7</URL>
-              <Description></Description>
+              <Description/>
          </InformationURL>      
       </ResourceHeader>
       <AccessInformation>
@@ -45,13 +45,13 @@
       <MeasurementType>MagneticField</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
-            <StartDate>1997-09-02T00:00:12Z</StartDate>
-             <StopDate>2017-08-12T23:59:47Z</StopDate>
+            <StartDate>2016-08-01T00:00:00Z</StartDate>
+             <StopDate>2017-10-05T23:59:59Z</StopDate>
          </TimeSpan>
          <Cadence>PT60S</Cadence>
       </TemporalDescription>
       <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
-      <Caveats></Caveats>
+      <Caveats/>
       <Parameter>
          <Name>|b|</Name>
          <ParameterKey>dsc_b_1s_mag</ParameterKey>
diff --git a/NumericalData/AMDA/Ephemerides/p67-orb-all.xml b/NumericalData/AMDA/Ephemerides/p67-orb-all.xml
index 95ca516..ad1a6b7 100644
--- a/NumericalData/AMDA/Ephemerides/p67-orb-all.xml
+++ b/NumericalData/AMDA/Ephemerides/p67-orb-all.xml
@@ -41,8 +41,8 @@
       <MeasurementType>Ephemeris</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
-             <StartDate>2010-07-01T00:00:25Z</StartDate>
-             <StopDate>2016-12-30T22:00:25Z</StopDate>
+             <StartDate>2010-07-01T00:00:05Z</StartDate>
+             <StopDate>2016-12-31T23:00:04Z</StopDate>
          </TimeSpan>
       <Cadence>PT60M</Cadence></TemporalDescription>
       <ObservedRegion>Comet</ObservedRegion>
diff --git a/NumericalData/AMDA/Juno/Ephemeris/juno-ephem-orb1.xml b/NumericalData/AMDA/Juno/Ephemeris/juno-ephem-orb1.xml
index 38828ee..383fda7 100644
--- a/NumericalData/AMDA/Juno/Ephemeris/juno-ephem-orb1.xml
+++ b/NumericalData/AMDA/Juno/Ephemeris/juno-ephem-orb1.xml
@@ -9,8 +9,8 @@
          <Description/>                                 
          <Acknowledgement/>                     
             <Contact>
-                <PersonID></PersonID>
-                <Role></Role>
+                <PersonID/>
+                <Role/>
             </Contact>  
          <Association>
             <AssociationID>juno-jupiter-orb</AssociationID>
@@ -42,8 +42,8 @@
       <MeasurementType>Ephemeris</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
-             <StartDate>2016-06-01T00:00:00Z</StartDate>
-             <StopDate>2018-02-20T23:49:59Z</StopDate>
+             <StartDate>2016-07-08T00:00:00Z</StartDate>
+             <StopDate>2016-10-18T00:00:00Z</StopDate>
          </TimeSpan>
       <Cadence>PT1S</Cadence>
 	  </TemporalDescription>
diff --git a/NumericalData/AMDA/Juno/Ephemeris/juno-jupiter-all.xml b/NumericalData/AMDA/Juno/Ephemeris/juno-jupiter-all.xml
index 1573da2..e2c14b2 100644
--- a/NumericalData/AMDA/Juno/Ephemeris/juno-jupiter-all.xml
+++ b/NumericalData/AMDA/Juno/Ephemeris/juno-jupiter-all.xml
@@ -46,7 +46,7 @@
       <MeasurementType>Ephemeris</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
-             <StartDate>2016-06-01T00:00:00Z</StartDate>
+             <StartDate>2012-05-28T00:00:00Z</StartDate>
              <StopDate>2018-02-20T23:49:59Z</StopDate>
          </TimeSpan>
       <Cadence>PT300S</Cadence></TemporalDescription>
diff --git a/NumericalData/AMDA/Juno/FGM/juno-fgm-cruise60.xml b/NumericalData/AMDA/Juno/FGM/juno-fgm-cruise60.xml
index 30762b4..01575d9 100644
--- a/NumericalData/AMDA/Juno/FGM/juno-fgm-cruise60.xml
+++ b/NumericalData/AMDA/Juno/FGM/juno-fgm-cruise60.xml
@@ -8,8 +8,8 @@
             <ReleaseDate>2017-10-16T15:10:29Z</ReleaseDate>
             <Description/>
             <Contact>
-                <PersonID></PersonID>
-                <Role></Role>
+                <PersonID/>
+                <Role/>
             </Contact>  
             <Association>
                 <AssociationID>juno-fgm-cruise</AssociationID>
@@ -31,8 +31,8 @@
         <MeasurementType>MagneticField</MeasurementType>
         <TemporalDescription>
             <TimeSpan>
-                <StartDate>2004-01-01T00:00:30Z</StartDate>
-                <StopDate>2016-03-31T23:59:12Z</StopDate>
+                <StartDate>2016-01-01T00:00:31Z</StartDate>
+                <StopDate>2016-06-29T23:54:31Z</StopDate>
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Juno/FGM/juno-fgm-orb1.xml b/NumericalData/AMDA/Juno/FGM/juno-fgm-orb1.xml
index 8f9b72e..8b7f85c 100644
--- a/NumericalData/AMDA/Juno/FGM/juno-fgm-orb1.xml
+++ b/NumericalData/AMDA/Juno/FGM/juno-fgm-orb1.xml
@@ -8,8 +8,8 @@
             <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
             <Description/>
             <Contact>
-                <PersonID></PersonID>
-                <Role></Role>
+                <PersonID/>
+                <Role/>
             </Contact>  
             <Association>
                 <AssociationID>juno-fgm-orb</AssociationID>
@@ -31,8 +31,8 @@
         <MeasurementType>MagneticField</MeasurementType>
         <TemporalDescription>
             <TimeSpan>
-                <StartDate>2004-01-01T00:00:30Z</StartDate>
-                <StopDate>2016-03-31T23:59:12Z</StopDate>
+                <StartDate>2016-07-08T00:00:00Z</StartDate>
+                <StopDate>2016-10-18T00:00:00Z</StopDate>
             </TimeSpan>
             <Cadence>PT1S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Juno/FGM/juno-fgm-orb60.xml b/NumericalData/AMDA/Juno/FGM/juno-fgm-orb60.xml
index 69d618b..d257581 100644
--- a/NumericalData/AMDA/Juno/FGM/juno-fgm-orb60.xml
+++ b/NumericalData/AMDA/Juno/FGM/juno-fgm-orb60.xml
@@ -8,8 +8,8 @@
             <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
             <Description/>
             <Contact>
-                <PersonID></PersonID>
-                <Role></Role>
+                <PersonID/>
+                <Role/>
             </Contact>  
             <Association>
                 <AssociationID>juno-fgm-orb</AssociationID>
@@ -31,8 +31,8 @@
         <MeasurementType>MagneticField</MeasurementType>
         <TemporalDescription>
             <TimeSpan>
-                <StartDate>2004-01-01T00:00:30Z</StartDate>
-                <StopDate>2016-03-31T23:59:12Z</StopDate>
+                <StartDate>2016-07-08T00:00:30Z</StartDate>
+                <StopDate>2016-10-17T23:59:31Z</StopDate>
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Juno/FGM/juno-fgm-orbfull.xml b/NumericalData/AMDA/Juno/FGM/juno-fgm-orbfull.xml
index 5c78aa3..d3da749 100644
--- a/NumericalData/AMDA/Juno/FGM/juno-fgm-orbfull.xml
+++ b/NumericalData/AMDA/Juno/FGM/juno-fgm-orbfull.xml
@@ -8,8 +8,8 @@
             <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
             <Description/>
             <Contact>
-                <PersonID></PersonID>
-                <Role></Role>
+                <PersonID/>
+                <Role/>
             </Contact>  
             <Association>
                 <AssociationID>juno-fgm-orb</AssociationID>
@@ -31,8 +31,8 @@
         <MeasurementType>MagneticField</MeasurementType>
         <TemporalDescription>
             <TimeSpan>
-                <StartDate>2004-01-01T00:00:30Z</StartDate>
-                <StopDate>2016-03-31T23:59:12Z</StopDate>
+                <StartDate>2016-07-08T00:00:00Z</StartDate>
+                <StopDate>2016-07-09T00:00:00Z</StopDate>
             </TimeSpan>
             <Cadence>PT0.015S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Juno/JEDI/juno-jedi-e090.xml b/NumericalData/AMDA/Juno/JEDI/juno-jedi-e090.xml
index 46cbc42..d87486e 100644
--- a/NumericalData/AMDA/Juno/JEDI/juno-jedi-e090.xml
+++ b/NumericalData/AMDA/Juno/JEDI/juno-jedi-e090.xml
@@ -1,113 +1,113 @@
-<?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/Juno/JEDI/juno-jedi-e090</ResourceID>
-        <ResourceHeader>
-            <ResourceName>instrument-90</ResourceName> <!--- BR -->
-            <AlternateName></AlternateName>
-            <ReleaseDate></ReleaseDate> <!--- BR -->
-            <Description/><!--- NA -->
-              <Contact> <!--- NA -->
-                <PersonID></PersonID>
-                <Role>PrincipalInvestigator</Role>
-            </Contact>
-            <Association> <!--- BR : datasetGroup -->
-                <AssociationID>juno-jedi-e</AssociationID>
-                <AssociationType>PartOf</AssociationType>
-                <Note>electrons</Note>
-            </Association>
-        </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>PDS</ProviderName><!--- BR -->
-        <ProviderResourceName>JED_HIERSESP_CDR; JED_LOERSESP_CDR</ProviderResourceName> <!--- BR -->      
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
-        <MeasurementType>EnergeticParticles</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan><!--- auto -->
-                <StartDate></StartDate>
-                <StopDate></StopDate>
-            </TimeSpan>
-            <Cadence_Min>PT0.5S</Cadence_Min>
-            <Cadence_Max>PT3S</Cadence_Max><!--- BR ; Cadince_Min, Cadence_Max -->
-        </TemporalDescription>
-        <ObservedRegion>Jupiter</ObservedRegion>
-        <Caveats></Caveats><!--- BR ? NA ? -->
-        <Parameter><!--- BR -->
-            <Name>counts</Name>
-            <ParameterKey>jedi_e90_counts</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Electron</ParticleType>
-                <ParticleQuantity>Counts</ParticleQuantity>
-            </Particle>
-        </Parameter>     
-        <Parameter>
-            <Name>diff flux</Name>
-            <ParameterKey>jedi_e90_flux</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts per sec cm^2 ster keV</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Electron</ParticleType>
-                <ParticleQuantity>NumberFlux</ParticleQuantity>
-            </Particle>
-        </Parameter>
-        <Parameter>
-            <Name>counts/sec</Name>
-            <ParameterKey>jedi_e90_cps</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts per sec</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Electron</ParticleType>
-                <ParticleQuantity>CountRate</ParticleQuantity>
-            </Particle>
-        </Parameter>
-        <Parameter>
-            <Name>mode</Name>
-            <ParameterKey>jedi_e90_mode</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units></Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-        </Parameter>
-    </NumericalData>
-</Spase>
+<?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/Juno/JEDI/juno-jedi-e090</ResourceID>
+        <ResourceHeader>
+            <ResourceName>instrument-90</ResourceName> <!--- BR -->
+            <AlternateName/>
+            <ReleaseDate/> <!--- BR -->
+            <Description/><!--- NA -->
+              <Contact> <!--- NA -->
+                <PersonID/>
+                <Role>PrincipalInvestigator</Role>
+            </Contact>
+            <Association> <!--- BR : datasetGroup -->
+                <AssociationID>juno-jedi-e</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>electrons</Note>
+            </Association>
+        </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>PDS</ProviderName><!--- BR -->
+        <ProviderResourceName>JED_HIERSESP_CDR; JED_LOERSESP_CDR</ProviderResourceName> <!--- BR -->      
+        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
+        <MeasurementType>EnergeticParticles</MeasurementType>
+        <TemporalDescription>
+            <TimeSpan><!--- auto -->
+                <StartDate>2016-08-27T07:53:28Z</StartDate>
+                <StopDate>2016-08-27T18:51:39Z</StopDate>
+            </TimeSpan>
+            <Cadence_Min>PT0.5S</Cadence_Min>
+            <Cadence_Max>PT3S</Cadence_Max><!--- BR ; Cadince_Min, Cadence_Max -->
+        </TemporalDescription>
+        <ObservedRegion>Jupiter</ObservedRegion>
+        <Caveats/><!--- BR ? NA ? -->
+        <Parameter><!--- BR -->
+            <Name>counts</Name>
+            <ParameterKey>jedi_e90_counts</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Electron</ParticleType>
+                <ParticleQuantity>Counts</ParticleQuantity>
+            </Particle>
+        </Parameter>     
+        <Parameter>
+            <Name>diff flux</Name>
+            <ParameterKey>jedi_e90_flux</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts per sec cm^2 ster keV</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Electron</ParticleType>
+                <ParticleQuantity>NumberFlux</ParticleQuantity>
+            </Particle>
+        </Parameter>
+        <Parameter>
+            <Name>counts/sec</Name>
+            <ParameterKey>jedi_e90_cps</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts per sec</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Electron</ParticleType>
+                <ParticleQuantity>CountRate</ParticleQuantity>
+            </Particle>
+        </Parameter>
+        <Parameter>
+            <Name>mode</Name>
+            <ParameterKey>jedi_e90_mode</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units/>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+        </Parameter>
+    </NumericalData>
+</Spase>
diff --git a/NumericalData/AMDA/Juno/JEDI/juno-jedi-e180.xml b/NumericalData/AMDA/Juno/JEDI/juno-jedi-e180.xml
index 735b613..4902de0 100644
--- a/NumericalData/AMDA/Juno/JEDI/juno-jedi-e180.xml
+++ b/NumericalData/AMDA/Juno/JEDI/juno-jedi-e180.xml
@@ -1,113 +1,113 @@
-<?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/Juno/JEDI/juno-jedi-e180</ResourceID>
-        <ResourceHeader>
-            <ResourceName>instrument-180</ResourceName> <!--- BR -->
-            <AlternateName></AlternateName>
-            <ReleaseDate></ReleaseDate> <!--- BR -->
-            <Description/><!--- NA -->
-              <Contact> <!--- NA -->
-                <PersonID></PersonID>
-                <Role>PrincipalInvestigator</Role>
-            </Contact>
-            <Association> <!--- BR : datasetGroup -->
-                <AssociationID>juno-jedi-e</AssociationID>
-                <AssociationType>PartOf</AssociationType>
-                <Note>electrons</Note>
-            </Association>
-        </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>PDS</ProviderName><!--- BR -->
-        <ProviderResourceName>JED_HIERSESP_CDR; JED_LOERSESP_CDR</ProviderResourceName> <!--- BR -->      
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
-        <MeasurementType>EnergeticParticles</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan><!--- auto -->
-                <StartDate></StartDate>
-                <StopDate></StopDate>
-            </TimeSpan>
-            <Cadence_Min>PT0.5S</Cadence_Min>
-            <Cadence_Max>PT3S</Cadence_Max><!--- BR ; Cadince_Min, Cadence_Max -->
-        </TemporalDescription>
-        <ObservedRegion>Jupiter</ObservedRegion>
-        <Caveats></Caveats><!--- BR ? NA ? -->
-        <Parameter><!--- BR -->
-            <Name>counts</Name>
-            <ParameterKey>jedi_e180_counts</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Electron</ParticleType>
-                <ParticleQuantity>Counts</ParticleQuantity>
-            </Particle>
-        </Parameter>     
-        <Parameter>
-            <Name>diff flux</Name>
-            <ParameterKey>jedi_e180_flux</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts per sec cm^2 ster keV</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Electron</ParticleType>
-                <ParticleQuantity>NumberFlux</ParticleQuantity>
-            </Particle>
-        </Parameter>
-        <Parameter>
-            <Name>counts/sec</Name>
-            <ParameterKey>jedi_e180_cps</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts per sec</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Electron</ParticleType>
-                <ParticleQuantity>CountRate</ParticleQuantity>
-            </Particle>
-        </Parameter>
-        <Parameter>
-            <Name>mode</Name>
-            <ParameterKey>jedi_e180_mode</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units></Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-        </Parameter>
-    </NumericalData>
-</Spase>
+<?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/Juno/JEDI/juno-jedi-e180</ResourceID>
+        <ResourceHeader>
+            <ResourceName>instrument-180</ResourceName> <!--- BR -->
+            <AlternateName/>
+            <ReleaseDate/> <!--- BR -->
+            <Description/><!--- NA -->
+              <Contact> <!--- NA -->
+                <PersonID/>
+                <Role>PrincipalInvestigator</Role>
+            </Contact>
+            <Association> <!--- BR : datasetGroup -->
+                <AssociationID>juno-jedi-e</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>electrons</Note>
+            </Association>
+        </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>PDS</ProviderName><!--- BR -->
+        <ProviderResourceName>JED_HIERSESP_CDR; JED_LOERSESP_CDR</ProviderResourceName> <!--- BR -->      
+        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
+        <MeasurementType>EnergeticParticles</MeasurementType>
+        <TemporalDescription>
+            <TimeSpan><!--- auto -->
+                <StartDate>2016-07-06T22:04:14Z</StartDate>
+                <StopDate>2016-08-27T23:59:58Z</StopDate>
+            </TimeSpan>
+            <Cadence_Min>PT0.5S</Cadence_Min>
+            <Cadence_Max>PT3S</Cadence_Max><!--- BR ; Cadince_Min, Cadence_Max -->
+        </TemporalDescription>
+        <ObservedRegion>Jupiter</ObservedRegion>
+        <Caveats/><!--- BR ? NA ? -->
+        <Parameter><!--- BR -->
+            <Name>counts</Name>
+            <ParameterKey>jedi_e180_counts</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Electron</ParticleType>
+                <ParticleQuantity>Counts</ParticleQuantity>
+            </Particle>
+        </Parameter>     
+        <Parameter>
+            <Name>diff flux</Name>
+            <ParameterKey>jedi_e180_flux</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts per sec cm^2 ster keV</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Electron</ParticleType>
+                <ParticleQuantity>NumberFlux</ParticleQuantity>
+            </Particle>
+        </Parameter>
+        <Parameter>
+            <Name>counts/sec</Name>
+            <ParameterKey>jedi_e180_cps</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts per sec</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Electron</ParticleType>
+                <ParticleQuantity>CountRate</ParticleQuantity>
+            </Particle>
+        </Parameter>
+        <Parameter>
+            <Name>mode</Name>
+            <ParameterKey>jedi_e180_mode</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units/>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+        </Parameter>
+    </NumericalData>
+</Spase>
diff --git a/NumericalData/AMDA/Juno/JEDI/juno-jedi-e270.xml b/NumericalData/AMDA/Juno/JEDI/juno-jedi-e270.xml
index 73fb66d..19c5f60 100644
--- a/NumericalData/AMDA/Juno/JEDI/juno-jedi-e270.xml
+++ b/NumericalData/AMDA/Juno/JEDI/juno-jedi-e270.xml
@@ -1,113 +1,113 @@
-<?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/Juno/JEDI/juno-jedi-e270</ResourceID>
-        <ResourceHeader>
-            <ResourceName>instrument-270</ResourceName> <!--- BR -->
-            <AlternateName></AlternateName>
-            <ReleaseDate></ReleaseDate> <!--- BR -->
-            <Description/><!--- NA -->
-              <Contact> <!--- NA -->
-                <PersonID></PersonID>
-                <Role>PrincipalInvestigator</Role>
-            </Contact>
-            <Association> <!--- BR : datasetGroup -->
-                <AssociationID>juno-jedi-e</AssociationID>
-                <AssociationType>PartOf</AssociationType>
-                <Note>electrons</Note>
-            </Association>
-        </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>PDS</ProviderName><!--- BR -->
-        <ProviderResourceName>JED_HIERSESP_CDR; JED_LOERSESP_CDR</ProviderResourceName> <!--- BR -->      
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
-        <MeasurementType>EnergeticParticles</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan><!--- auto -->
-                <StartDate></StartDate>
-                <StopDate></StopDate>
-            </TimeSpan>
-            <Cadence_Min>PT0.5S</Cadence_Min>
-            <Cadence_Max>PT3S</Cadence_Max><!--- BR ; Cadince_Min, Cadence_Max -->
-        </TemporalDescription>
-        <ObservedRegion>Jupiter</ObservedRegion>
-        <Caveats></Caveats><!--- BR ? NA ? -->
-        <Parameter><!--- BR -->
-            <Name>counts</Name>
-            <ParameterKey>jedi_e270_counts</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Electron</ParticleType>
-                <ParticleQuantity>Counts</ParticleQuantity>
-            </Particle>
-        </Parameter>     
-        <Parameter>
-            <Name>diff flux</Name>
-            <ParameterKey>jedi_e270_flux</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts per sec cm^2 ster keV</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Electron</ParticleType>
-                <ParticleQuantity>NumberFlux</ParticleQuantity>
-            </Particle>
-        </Parameter>
-        <Parameter>
-            <Name>counts/sec</Name>
-            <ParameterKey>jedi_e270_cps</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts per sec</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Electron</ParticleType>
-                <ParticleQuantity>CountRate</ParticleQuantity>
-            </Particle>
-        </Parameter>
-        <Parameter>
-            <Name>mode</Name>
-            <ParameterKey>jedi_e270_mode</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units></Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-        </Parameter>
-    </NumericalData>
-</Spase>
+<?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/Juno/JEDI/juno-jedi-e270</ResourceID>
+        <ResourceHeader>
+            <ResourceName>instrument-270</ResourceName> <!--- BR -->
+            <AlternateName/>
+            <ReleaseDate/> <!--- BR -->
+            <Description/><!--- NA -->
+              <Contact> <!--- NA -->
+                <PersonID/>
+                <Role>PrincipalInvestigator</Role>
+            </Contact>
+            <Association> <!--- BR : datasetGroup -->
+                <AssociationID>juno-jedi-e</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>electrons</Note>
+            </Association>
+        </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>PDS</ProviderName><!--- BR -->
+        <ProviderResourceName>JED_HIERSESP_CDR; JED_LOERSESP_CDR</ProviderResourceName> <!--- BR -->      
+        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
+        <MeasurementType>EnergeticParticles</MeasurementType>
+        <TemporalDescription>
+            <TimeSpan><!--- auto -->
+                <StartDate>2016-08-27T07:52:57Z</StartDate>
+                <StopDate>2016-08-27T18:51:39Z</StopDate>
+            </TimeSpan>
+            <Cadence_Min>PT0.5S</Cadence_Min>
+            <Cadence_Max>PT3S</Cadence_Max><!--- BR ; Cadince_Min, Cadence_Max -->
+        </TemporalDescription>
+        <ObservedRegion>Jupiter</ObservedRegion>
+        <Caveats/><!--- BR ? NA ? -->
+        <Parameter><!--- BR -->
+            <Name>counts</Name>
+            <ParameterKey>jedi_e270_counts</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Electron</ParticleType>
+                <ParticleQuantity>Counts</ParticleQuantity>
+            </Particle>
+        </Parameter>     
+        <Parameter>
+            <Name>diff flux</Name>
+            <ParameterKey>jedi_e270_flux</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts per sec cm^2 ster keV</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Electron</ParticleType>
+                <ParticleQuantity>NumberFlux</ParticleQuantity>
+            </Particle>
+        </Parameter>
+        <Parameter>
+            <Name>counts/sec</Name>
+            <ParameterKey>jedi_e270_cps</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts per sec</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Electron</ParticleType>
+                <ParticleQuantity>CountRate</ParticleQuantity>
+            </Particle>
+        </Parameter>
+        <Parameter>
+            <Name>mode</Name>
+            <ParameterKey>jedi_e270_mode</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units/>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+        </Parameter>
+    </NumericalData>
+</Spase>
diff --git a/NumericalData/AMDA/Juno/JEDI/juno-jedi-epitch.xml b/NumericalData/AMDA/Juno/JEDI/juno-jedi-epitch.xml
index fcc1e88..3366cc7 100644
--- a/NumericalData/AMDA/Juno/JEDI/juno-jedi-epitch.xml
+++ b/NumericalData/AMDA/Juno/JEDI/juno-jedi-epitch.xml
@@ -5,11 +5,11 @@
         <ResourceID>spase://CDPP/NumericalData/AMDA/Juno/JEDI/juno-jedi-epitch</ResourceID>
         <ResourceHeader>
             <ResourceName>PAD</ResourceName>
-            <AlternateName></AlternateName>
-            <ReleaseDate></ReleaseDate>
+            <AlternateName/>
+            <ReleaseDate/>
             <Description/>
               <Contact>
-                <PersonID></PersonID>
+                <PersonID/>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Association>
@@ -28,44 +28,44 @@
             <Format>NetCDF</Format>
         </AccessInformation>
         <ProviderName>PDS</ProviderName>
-        <ProviderResourceName></ProviderResourceName>
+        <ProviderResourceName/>
         <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
-        <MeasurementType></MeasurementType>
+        <MeasurementType/>
         <TemporalDescription>
             <TimeSpan>
-                <StartDate></StartDate>
-                <StopDate></StopDate>
+                <StartDate>1970-01-01T00:00:00Z</StartDate>
+                <StopDate>1970-01-01T00:00:00Z</StopDate>
             </TimeSpan>
-            <Cadence></Cadence>
+            <Cadence/>
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
             <Name>cnts</Name>
             <ParameterKey>juno_jedi_elec_pad_cnts</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units></Units>
-            <UnitsConversion></UnitsConversion>
+            <Description/>
+            <Ucd/>
+            <Units/>
+            <UnitsConversion/>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
             <Structure>
-                <Size></Size>               
+                <Size/>               
             </Structure>
             <Particle>
             </Particle>
             <Parameter>
             <Name>diff flux</Name>
             <ParameterKey>juno_jedi_elec_pad_flux</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units></Units>
-            <UnitsConversion></UnitsConversion>
+            <Description/>
+            <Ucd/>
+            <Units/>
+            <UnitsConversion/>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
             <Structure>
-                <Size></Size>               
+                <Size/>               
             </Structure>
             <Particle>
             </Particle>
diff --git a/NumericalData/AMDA/Juno/JEDI/juno-jedi-i090.xml b/NumericalData/AMDA/Juno/JEDI/juno-jedi-i090.xml
index 2fab8f5..f2058e0 100644
--- a/NumericalData/AMDA/Juno/JEDI/juno-jedi-i090.xml
+++ b/NumericalData/AMDA/Juno/JEDI/juno-jedi-i090.xml
@@ -1,113 +1,113 @@
-<?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/Juno/JEDI/juno-jedi-i090</ResourceID>
-        <ResourceHeader>
-            <ResourceName>instrument-90</ResourceName> <!--- BR -->
-            <AlternateName></AlternateName>
-            <ReleaseDate></ReleaseDate> <!--- BR -->
-            <Description/><!--- NA -->
-              <Contact> <!--- NA -->
-                <PersonID></PersonID>
-                <Role>PrincipalInvestigator</Role>
-            </Contact>
-            <Association> <!--- BR : datasetGroup -->
-                <AssociationID>juno-jedi-i</AssociationID>
-                <AssociationType>PartOf</AssociationType>
-                <Note>ions</Note>
-            </Association>
-        </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>PDS</ProviderName><!--- BR -->
-        <ProviderResourceName>JED_HIERSISP_CDR; JED_LOERSISP_CDR</ProviderResourceName> <!--- BR -->      
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
-        <MeasurementType>EnergeticParticles</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan><!--- auto -->
-                <StartDate></StartDate>
-                <StopDate></StopDate>
-            </TimeSpan>
-            <Cadence_Min>PT0.5S</Cadence_Min>
-            <Cadence_Max>PT3S</Cadence_Max><!--- BR ; Cadince_Min, Cadence_Max -->
-        </TemporalDescription>
-        <ObservedRegion>Jupiter</ObservedRegion>
-        <Caveats></Caveats><!--- BR ? NA ? -->
-        <Parameter><!--- BR -->
-            <Name>counts</Name>
-            <ParameterKey>jedi_i90_counts</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Ion</ParticleType>
-                <ParticleQuantity>Counts</ParticleQuantity>
-            </Particle>
-        </Parameter>     
-        <Parameter>
-            <Name>diff flux</Name>
-            <ParameterKey>jedi_i90_flux</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts per sec cm^2 ster keV</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Ion</ParticleType>
-                <ParticleQuantity>NumberFlux</ParticleQuantity>
-            </Particle>
-        </Parameter>
-        <Parameter>
-            <Name>counts/sec</Name>
-            <ParameterKey>jedi_i90_cps</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts per sec</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Ion</ParticleType>
-                <ParticleQuantity>CountRate</ParticleQuantity>
-            </Particle>
-        </Parameter>
-        <Parameter>
-            <Name>mode</Name>
-            <ParameterKey>jedi_i90_mode</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units></Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-        </Parameter>
-    </NumericalData>
-</Spase>
+<?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/Juno/JEDI/juno-jedi-i090</ResourceID>
+        <ResourceHeader>
+            <ResourceName>instrument-90</ResourceName> <!--- BR -->
+            <AlternateName/>
+            <ReleaseDate/> <!--- BR -->
+            <Description/><!--- NA -->
+              <Contact> <!--- NA -->
+                <PersonID/>
+                <Role>PrincipalInvestigator</Role>
+            </Contact>
+            <Association> <!--- BR : datasetGroup -->
+                <AssociationID>juno-jedi-i</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>ions</Note>
+            </Association>
+        </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>PDS</ProviderName><!--- BR -->
+        <ProviderResourceName>JED_HIERSISP_CDR; JED_LOERSISP_CDR</ProviderResourceName> <!--- BR -->      
+        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
+        <MeasurementType>EnergeticParticles</MeasurementType>
+        <TemporalDescription>
+            <TimeSpan><!--- auto -->
+                <StartDate>2016-08-26T12:07:59Z</StartDate>
+                <StopDate>2016-08-27T23:56:59Z</StopDate>
+            </TimeSpan>
+            <Cadence_Min>PT0.5S</Cadence_Min>
+            <Cadence_Max>PT3S</Cadence_Max><!--- BR ; Cadince_Min, Cadence_Max -->
+        </TemporalDescription>
+        <ObservedRegion>Jupiter</ObservedRegion>
+        <Caveats/><!--- BR ? NA ? -->
+        <Parameter><!--- BR -->
+            <Name>counts</Name>
+            <ParameterKey>jedi_i90_counts</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>Counts</ParticleQuantity>
+            </Particle>
+        </Parameter>     
+        <Parameter>
+            <Name>diff flux</Name>
+            <ParameterKey>jedi_i90_flux</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts per sec cm^2 ster keV</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>NumberFlux</ParticleQuantity>
+            </Particle>
+        </Parameter>
+        <Parameter>
+            <Name>counts/sec</Name>
+            <ParameterKey>jedi_i90_cps</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts per sec</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>CountRate</ParticleQuantity>
+            </Particle>
+        </Parameter>
+        <Parameter>
+            <Name>mode</Name>
+            <ParameterKey>jedi_i90_mode</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units/>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+        </Parameter>
+    </NumericalData>
+</Spase>
diff --git a/NumericalData/AMDA/Juno/JEDI/juno-jedi-i180.xml b/NumericalData/AMDA/Juno/JEDI/juno-jedi-i180.xml
index 453a2ae..de8f1d3 100644
--- a/NumericalData/AMDA/Juno/JEDI/juno-jedi-i180.xml
+++ b/NumericalData/AMDA/Juno/JEDI/juno-jedi-i180.xml
@@ -1,113 +1,113 @@
-<?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/Juno/JEDI/juno-jedi-i180</ResourceID>
-        <ResourceHeader>
-            <ResourceName>instrument-180</ResourceName> <!--- BR -->
-            <AlternateName></AlternateName>
-            <ReleaseDate></ReleaseDate> <!--- BR -->
-            <Description/><!--- NA -->
-              <Contact> <!--- NA -->
-                <PersonID></PersonID>
-                <Role>PrincipalInvestigator</Role>
-            </Contact>
-            <Association> <!--- BR : datasetGroup -->
-                <AssociationID>juno-jedi-i</AssociationID>
-                <AssociationType>PartOf</AssociationType>
-                <Note>ions</Note>
-            </Association>
-        </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>PDS</ProviderName><!--- BR -->
-        <ProviderResourceName>JED_HIERSISP_CDR; JED_LOERSISP_CDR</ProviderResourceName> <!--- BR -->      
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
-        <MeasurementType>EnergeticParticles</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan><!--- auto -->
-                <StartDate></StartDate>
-                <StopDate></StopDate>
-            </TimeSpan>
-            <Cadence_Min>PT0.5S</Cadence_Min>
-            <Cadence_Max>PT3S</Cadence_Max><!--- BR ; Cadince_Min, Cadence_Max -->
-        </TemporalDescription>
-        <ObservedRegion>Jupiter</ObservedRegion>
-        <Caveats></Caveats><!--- BR ? NA ? -->
-        <Parameter><!--- BR -->
-            <Name>counts</Name>
-            <ParameterKey>jedi_i180_counts</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Ion</ParticleType>
-                <ParticleQuantity>Counts</ParticleQuantity>
-            </Particle>
-        </Parameter>     
-        <Parameter>
-            <Name>diff flux</Name>
-            <ParameterKey>jedi_i180_flux</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts per sec cm^2 ster keV</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Ion</ParticleType>
-                <ParticleQuantity>NumberFlux</ParticleQuantity>
-            </Particle>
-        </Parameter>
-        <Parameter>
-            <Name>counts/sec</Name>
-            <ParameterKey>jedi_i180_cps</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts per sec</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Ion</ParticleType>
-                <ParticleQuantity>CountRate</ParticleQuantity>
-            </Particle>
-        </Parameter>
-        <Parameter>
-            <Name>mode</Name>
-            <ParameterKey>jedi_i180_mode</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units></Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-        </Parameter>
-    </NumericalData>
-</Spase>
+<?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/Juno/JEDI/juno-jedi-i180</ResourceID>
+        <ResourceHeader>
+            <ResourceName>instrument-180</ResourceName> <!--- BR -->
+            <AlternateName/>
+            <ReleaseDate/> <!--- BR -->
+            <Description/><!--- NA -->
+              <Contact> <!--- NA -->
+                <PersonID/>
+                <Role>PrincipalInvestigator</Role>
+            </Contact>
+            <Association> <!--- BR : datasetGroup -->
+                <AssociationID>juno-jedi-i</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>ions</Note>
+            </Association>
+        </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>PDS</ProviderName><!--- BR -->
+        <ProviderResourceName>JED_HIERSISP_CDR; JED_LOERSISP_CDR</ProviderResourceName> <!--- BR -->      
+        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
+        <MeasurementType>EnergeticParticles</MeasurementType>
+        <TemporalDescription>
+            <TimeSpan><!--- auto -->
+                <StartDate>2016-07-06T22:04:14Z</StartDate>
+                <StopDate>2016-08-27T23:59:58Z</StopDate>
+            </TimeSpan>
+            <Cadence_Min>PT0.5S</Cadence_Min>
+            <Cadence_Max>PT3S</Cadence_Max><!--- BR ; Cadince_Min, Cadence_Max -->
+        </TemporalDescription>
+        <ObservedRegion>Jupiter</ObservedRegion>
+        <Caveats/><!--- BR ? NA ? -->
+        <Parameter><!--- BR -->
+            <Name>counts</Name>
+            <ParameterKey>jedi_i180_counts</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>Counts</ParticleQuantity>
+            </Particle>
+        </Parameter>     
+        <Parameter>
+            <Name>diff flux</Name>
+            <ParameterKey>jedi_i180_flux</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts per sec cm^2 ster keV</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>NumberFlux</ParticleQuantity>
+            </Particle>
+        </Parameter>
+        <Parameter>
+            <Name>counts/sec</Name>
+            <ParameterKey>jedi_i180_cps</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts per sec</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>CountRate</ParticleQuantity>
+            </Particle>
+        </Parameter>
+        <Parameter>
+            <Name>mode</Name>
+            <ParameterKey>jedi_i180_mode</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units/>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+        </Parameter>
+    </NumericalData>
+</Spase>
diff --git a/NumericalData/AMDA/Juno/JEDI/juno-jedi-i270.xml b/NumericalData/AMDA/Juno/JEDI/juno-jedi-i270.xml
index c286945..6d22a02 100644
--- a/NumericalData/AMDA/Juno/JEDI/juno-jedi-i270.xml
+++ b/NumericalData/AMDA/Juno/JEDI/juno-jedi-i270.xml
@@ -1,113 +1,113 @@
-<?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/Juno/JEDI/juno-jedi-i270</ResourceID>
-        <ResourceHeader>
-            <ResourceName>instrument-270</ResourceName> <!--- BR -->
-            <AlternateName></AlternateName>
-            <ReleaseDate></ReleaseDate> <!--- BR -->
-            <Description/><!--- NA -->
-              <Contact> <!--- NA -->
-                <PersonID></PersonID>
-                <Role>PrincipalInvestigator</Role>
-            </Contact>
-            <Association> <!--- BR : datasetGroup -->
-                <AssociationID>juno-jedi-i</AssociationID>
-                <AssociationType>PartOf</AssociationType>
-                <Note>ions</Note>
-            </Association>
-        </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>PDS</ProviderName><!--- BR -->
-        <ProviderResourceName>JED_HIERSISP_CDR; JED_LOERSISP_CDR</ProviderResourceName> <!--- BR -->      
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
-        <MeasurementType>EnergeticParticles</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan><!--- auto -->
-                <StartDate></StartDate>
-                <StopDate></StopDate>
-            </TimeSpan>
-            <Cadence_Min>PT0.5S</Cadence_Min>
-            <Cadence_Max>PT3S</Cadence_Max><!--- BR ; Cadince_Min, Cadence_Max -->
-        </TemporalDescription>
-        <ObservedRegion>Jupiter</ObservedRegion>
-        <Caveats></Caveats><!--- BR ? NA ? -->
-        <Parameter><!--- BR -->
-            <Name>counts</Name>
-            <ParameterKey>jedi_i270_counts</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Ion</ParticleType>
-                <ParticleQuantity>Counts</ParticleQuantity>
-            </Particle>
-        </Parameter>     
-        <Parameter>
-            <Name>diff flux</Name>
-            <ParameterKey>jedi_i270_flux</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts per sec cm^2 ster keV</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Ion</ParticleType>
-                <ParticleQuantity>NumberFlux</ParticleQuantity>
-            </Particle>
-        </Parameter>
-        <Parameter>
-            <Name>counts/sec</Name>
-            <ParameterKey>jedi_i270_cps</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>counts per sec</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Particle>
-                <ParticleType>Ion</ParticleType>
-                <ParticleQuantity>CountRate</ParticleQuantity>
-            </Particle>
-        </Parameter>
-        <Parameter>
-            <Name>mode</Name>
-            <ParameterKey>jedi_i270_mode</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units></Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-        </Parameter>
-    </NumericalData>
-</Spase>
+<?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/Juno/JEDI/juno-jedi-i270</ResourceID>
+        <ResourceHeader>
+            <ResourceName>instrument-270</ResourceName> <!--- BR -->
+            <AlternateName/>
+            <ReleaseDate/> <!--- BR -->
+            <Description/><!--- NA -->
+              <Contact> <!--- NA -->
+                <PersonID/>
+                <Role>PrincipalInvestigator</Role>
+            </Contact>
+            <Association> <!--- BR : datasetGroup -->
+                <AssociationID>juno-jedi-i</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>ions</Note>
+            </Association>
+        </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>PDS</ProviderName><!--- BR -->
+        <ProviderResourceName>JED_HIERSISP_CDR; JED_LOERSISP_CDR</ProviderResourceName> <!--- BR -->      
+        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
+        <MeasurementType>EnergeticParticles</MeasurementType>
+        <TemporalDescription>
+            <TimeSpan><!--- auto -->
+                <StartDate>2016-08-26T12:07:29Z</StartDate>
+                <StopDate>2016-08-27T23:56:59Z</StopDate>
+            </TimeSpan>
+            <Cadence_Min>PT0.5S</Cadence_Min>
+            <Cadence_Max>PT3S</Cadence_Max><!--- BR ; Cadince_Min, Cadence_Max -->
+        </TemporalDescription>
+        <ObservedRegion>Jupiter</ObservedRegion>
+        <Caveats/><!--- BR ? NA ? -->
+        <Parameter><!--- BR -->
+            <Name>counts</Name>
+            <ParameterKey>jedi_i270_counts</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>Counts</ParticleQuantity>
+            </Particle>
+        </Parameter>     
+        <Parameter>
+            <Name>diff flux</Name>
+            <ParameterKey>jedi_i270_flux</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts per sec cm^2 ster keV</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>NumberFlux</ParticleQuantity>
+            </Particle>
+        </Parameter>
+        <Parameter>
+            <Name>counts/sec</Name>
+            <ParameterKey>jedi_i270_cps</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>counts per sec</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>CountRate</ParticleQuantity>
+            </Particle>
+        </Parameter>
+        <Parameter>
+            <Name>mode</Name>
+            <ParameterKey>jedi_i270_mode</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units/>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+        </Parameter>
+    </NumericalData>
+</Spase>
diff --git a/NumericalData/AMDA/Juno/JEDI/juno-jedi-tof90.xml b/NumericalData/AMDA/Juno/JEDI/juno-jedi-tof90.xml
index 553bcb9..19de47a 100644
--- a/NumericalData/AMDA/Juno/JEDI/juno-jedi-tof90.xml
+++ b/NumericalData/AMDA/Juno/JEDI/juno-jedi-tof90.xml
@@ -5,11 +5,11 @@
         <ResourceID>spase://CDPP/NumericalData/AMDA/Juno/JEDI/juno-jedi-tof90</ResourceID>
         <ResourceHeader>
             <ResourceName>ins-90</ResourceName>
-            <AlternateName></AlternateName>
-            <ReleaseDate></ReleaseDate>
+            <AlternateName/>
+            <ReleaseDate/>
             <Description/>
               <Contact>
-                <PersonID></PersonID>
+                <PersonID/>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Association>
@@ -28,29 +28,29 @@
             <Format>NetCDF</Format>
         </AccessInformation>
         <ProviderName>PDS</ProviderName>
-        <ProviderResourceName></ProviderResourceName>
+        <ProviderResourceName/>
         <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/JEDI</InstrumentID>
-        <MeasurementType></MeasurementType>
+        <MeasurementType/>
         <TemporalDescription>
             <TimeSpan>
-                <StartDate></StartDate>
-                <StopDate></StopDate>
+                <StartDate>1970-01-01T00:00:00Z</StartDate>
+                <StopDate>1970-01-01T00:00:00Z</StopDate>
             </TimeSpan>
-            <Cadence></Cadence>
+            <Cadence/>
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
             <Name>protons cnts</Name>
             <ParameterKey>juno_jedi_tof_p90_cnts</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units></Units>
-            <UnitsConversion></UnitsConversion>
+            <Description/>
+            <Ucd/>
+            <Units/>
+            <UnitsConversion/>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
             <Structure>
-                <Size></Size>               
+                <Size/>               
             </Structure>
             <Particle>
             </Particle>
@@ -58,15 +58,15 @@
         <Parameter>
             <Name>protons diff flix</Name>
             <ParameterKey>juno_jedi_tof_p90_flux</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units></Units>
-            <UnitsConversion></UnitsConversion>
+            <Description/>
+            <Ucd/>
+            <Units/>
+            <UnitsConversion/>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
             <Structure>
-                <Size></Size>               
+                <Size/>               
             </Structure>
             <Particle>
             </Particle>
diff --git a/NumericalData/AMDA/Juno/WAVES/juno-wav-orbb.xml b/NumericalData/AMDA/Juno/WAVES/juno-wav-orbb.xml
index d378154..016c85f 100644
--- a/NumericalData/AMDA/Juno/WAVES/juno-wav-orbb.xml
+++ b/NumericalData/AMDA/Juno/WAVES/juno-wav-orbb.xml
@@ -1,63 +1,63 @@
-<?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/Juno/WAVES/juno-wav-orbb</ResourceID>
-        <ResourceHeader>
-            <ResourceName>b spectral density</ResourceName> <!--- BR -->
-            <AlternateName></AlternateName>
-            <ReleaseDate></ReleaseDate> <!--- BR -->
-            <Description/><!--- NA -->
-              <Contact> <!--- NA -->
-                <PersonID></PersonID>
-                <Role>PrincipalInvestigator</Role>
-            </Contact>
-            <Association> <!--- BR : datasetGroup -->
-                <AssociationID>juno-wav-orb</AssociationID>
-                <AssociationType>PartOf</AssociationType>
-                <Note>orbit jupiter</Note>
-            </Association>
-        </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>PDS</ProviderName><!--- BR -->
-        <ProviderResourceName>JNO-E_J_SS-WAV-3-CDR-SRVFULL-V1.0</ProviderResourceName> <!--- BR -->      
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/WAVES</InstrumentID>
-        <MeasurementType>Waves</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan><!--- auto -->
-                <StartDate></StartDate>
-                <StopDate></StopDate>
-            </TimeSpan>
-            <Cadence_Min>PT1S</Cadence_Min>
-            <Cadence_Max>PT10S</Cadence_Max>  <!--- BR ; Cadence_Min, Cadence_Max -->
-        </TemporalDescription>
-        <ObservedRegion>Jupiter</ObservedRegion>
-        <Caveats></Caveats><!--- BR ? NA ? -->
-        <Parameter><!--- BR -->
-            <Name>b_lfrlo</Name>
-            <ParameterKey>juno_wav_b_orb_lfrlo</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>(nT**2)/Hz</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Wave>
-                <WaveType>PlasmaWaves</WaveType>
-                <WaveQuantity>ACMagneticField</WaveQuantity>
-            </Wave>
-        </Parameter>
-    </NumericalData>
-</Spase>
+<?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/Juno/WAVES/juno-wav-orbb</ResourceID>
+        <ResourceHeader>
+            <ResourceName>b spectral density</ResourceName> <!--- BR -->
+            <AlternateName/>
+            <ReleaseDate/> <!--- BR -->
+            <Description/><!--- NA -->
+              <Contact> <!--- NA -->
+                <PersonID/>
+                <Role>PrincipalInvestigator</Role>
+            </Contact>
+            <Association> <!--- BR : datasetGroup -->
+                <AssociationID>juno-wav-orb</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>orbit jupiter</Note>
+            </Association>
+        </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>PDS</ProviderName><!--- BR -->
+        <ProviderResourceName>JNO-E_J_SS-WAV-3-CDR-SRVFULL-V1.0</ProviderResourceName> <!--- BR -->      
+        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/WAVES</InstrumentID>
+        <MeasurementType>Waves</MeasurementType>
+        <TemporalDescription>
+            <TimeSpan><!--- auto -->
+                <StartDate>2016-07-06T20:56:08Z</StartDate>
+                <StopDate>2016-09-23T03:44:39Z</StopDate>
+            </TimeSpan>
+            <Cadence_Min>PT1S</Cadence_Min>
+            <Cadence_Max>PT10S</Cadence_Max>  <!--- BR ; Cadence_Min, Cadence_Max -->
+        </TemporalDescription>
+        <ObservedRegion>Jupiter</ObservedRegion>
+        <Caveats/><!--- BR ? NA ? -->
+        <Parameter><!--- BR -->
+            <Name>b_lfrlo</Name>
+            <ParameterKey>juno_wav_b_orb_lfrlo</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>(nT**2)/Hz</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Wave>
+                <WaveType>PlasmaWaves</WaveType>
+                <WaveQuantity>ACMagneticField</WaveQuantity>
+            </Wave>
+        </Parameter>
+    </NumericalData>
+</Spase>
diff --git a/NumericalData/AMDA/Juno/WAVES/juno-wav-orbe.xml b/NumericalData/AMDA/Juno/WAVES/juno-wav-orbe.xml
index b5e43c8..33803fc 100644
--- a/NumericalData/AMDA/Juno/WAVES/juno-wav-orbe.xml
+++ b/NumericalData/AMDA/Juno/WAVES/juno-wav-orbe.xml
@@ -1,117 +1,117 @@
-<?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/Juno/WAVES/juno-wav-orbe</ResourceID>
-        <ResourceHeader>
-            <ResourceName>e spectral density</ResourceName> <!--- BR -->
-            <AlternateName></AlternateName>
-            <ReleaseDate></ReleaseDate> <!--- BR -->
-            <Description/><!--- NA -->
-              <Contact> <!--- NA -->
-                <PersonID></PersonID>
-                <Role>PrincipalInvestigator</Role>
-            </Contact>
-            <Association> <!--- BR : datasetGroup -->
-                <AssociationID>juno-wav-orb</AssociationID>
-                <AssociationType>PartOf</AssociationType>
-                <Note>orbit jupiter</Note>
-            </Association>
-        </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>PDS</ProviderName><!--- BR -->
-        <ProviderResourceName>JNO-E_J_SS-WAV-3-CDR-SRVFULL-V1.0</ProviderResourceName> <!--- BR -->      
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/WAVES</InstrumentID>
-        <MeasurementType>Waves</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan><!--- auto -->
-                <StartDate></StartDate>
-                <StopDate></StopDate>
-            </TimeSpan>
-            <Cadence_Min>PT1S</Cadence_Min>
-            <Cadence_Max>PT10S</Cadence_Max><!--- BR ; Cadence_Min, Cadence_Max -->
-        </TemporalDescription>
-        <ObservedRegion>Jupiter</ObservedRegion>
-        <Caveats></Caveats><!--- BR ? NA ? -->
-        <Parameter><!--- BR -->
-            <Name>e_lfrlo</Name>
-            <ParameterKey>juno_wav_e_orb_lfrlo</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>(V**2/m**2)/Hz</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Wave>
-                <WaveType>PlasmaWaves</WaveType>
-                <WaveQuantity>ACElectricField</WaveQuantity>
-            </Wave>
-        </Parameter>
-		<Parameter><!--- BR -->
-            <Name>e_lfrhi</Name>
-            <ParameterKey>juno_wav_e_orb_lfrhi</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>(V**2/m**2)/Hz</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Wave>
-                <WaveType>PlasmaWaves</WaveType>
-                <WaveQuantity>ACElectricField</WaveQuantity>
-            </Wave>
-        </Parameter>
-		<Parameter><!--- BR -->
-            <Name>e_hfrlo</Name>
-            <ParameterKey>juno_wav_e_orb_hfrlo</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>(V**2/m**2)/Hz</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Wave>
-                <WaveType>PlasmaWaves</WaveType>
-                <WaveQuantity>ACElectricField</WaveQuantity>
-            </Wave>
-        </Parameter>
-		<Parameter><!--- BR -->
-            <Name>e_hfrhi</Name>
-            <ParameterKey>juno_wav_e_orb_hfrhi</ParameterKey>
-            <Description></Description>
-            <Ucd></Ucd>
-            <Units>(V**2/m**2)/Hz</Units>
-            <UnitsConversion></UnitsConversion>
-            <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size></Size>               
-            </Structure>
-            <Wave>
-                <WaveType>PlasmaWaves</WaveType>
-                <WaveQuantity>ACElectricField</WaveQuantity>
-            </Wave>
-        </Parameter>
-    </NumericalData>
-</Spase>
+<?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/Juno/WAVES/juno-wav-orbe</ResourceID>
+        <ResourceHeader>
+            <ResourceName>e spectral density</ResourceName> <!--- BR -->
+            <AlternateName/>
+            <ReleaseDate/> <!--- BR -->
+            <Description/><!--- NA -->
+              <Contact> <!--- NA -->
+                <PersonID/>
+                <Role>PrincipalInvestigator</Role>
+            </Contact>
+            <Association> <!--- BR : datasetGroup -->
+                <AssociationID>juno-wav-orb</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>orbit jupiter</Note>
+            </Association>
+        </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>PDS</ProviderName><!--- BR -->
+        <ProviderResourceName>JNO-E_J_SS-WAV-3-CDR-SRVFULL-V1.0</ProviderResourceName> <!--- BR -->      
+        <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/WAVES</InstrumentID>
+        <MeasurementType>Waves</MeasurementType>
+        <TemporalDescription>
+            <TimeSpan><!--- auto -->
+                <StartDate>2016-07-06T20:56:08Z</StartDate>
+                <StopDate>2016-09-23T03:44:39Z</StopDate>
+            </TimeSpan>
+            <Cadence_Min>PT1S</Cadence_Min>
+            <Cadence_Max>PT10S</Cadence_Max><!--- BR ; Cadence_Min, Cadence_Max -->
+        </TemporalDescription>
+        <ObservedRegion>Jupiter</ObservedRegion>
+        <Caveats/><!--- BR ? NA ? -->
+        <Parameter><!--- BR -->
+            <Name>e_lfrlo</Name>
+            <ParameterKey>juno_wav_e_orb_lfrlo</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>(V**2/m**2)/Hz</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Wave>
+                <WaveType>PlasmaWaves</WaveType>
+                <WaveQuantity>ACElectricField</WaveQuantity>
+            </Wave>
+        </Parameter>
+		<Parameter><!--- BR -->
+            <Name>e_lfrhi</Name>
+            <ParameterKey>juno_wav_e_orb_lfrhi</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>(V**2/m**2)/Hz</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Wave>
+                <WaveType>PlasmaWaves</WaveType>
+                <WaveQuantity>ACElectricField</WaveQuantity>
+            </Wave>
+        </Parameter>
+		<Parameter><!--- BR -->
+            <Name>e_hfrlo</Name>
+            <ParameterKey>juno_wav_e_orb_hfrlo</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>(V**2/m**2)/Hz</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Wave>
+                <WaveType>PlasmaWaves</WaveType>
+                <WaveQuantity>ACElectricField</WaveQuantity>
+            </Wave>
+        </Parameter>
+		<Parameter><!--- BR -->
+            <Name>e_hfrhi</Name>
+            <ParameterKey>juno_wav_e_orb_hfrhi</ParameterKey>
+            <Description/>
+            <Ucd/>
+            <Units>(V**2/m**2)/Hz</Units>
+            <UnitsConversion/>
+            <RenderingHints>
+                <DisplayType>Spectrogram</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size/>               
+            </Structure>
+            <Wave>
+                <WaveType>PlasmaWaves</WaveType>
+                <WaveQuantity>ACElectricField</WaveQuantity>
+            </Wave>
+        </Parameter>
+    </NumericalData>
+</Spase>
diff --git a/NumericalData/AMDA/MAVEN/EUV/mvn-euv-clb.xml b/NumericalData/AMDA/MAVEN/EUV/mvn-euv-clb.xml
index 851972b..41863bf 100644
--- a/NumericalData/AMDA/MAVEN/EUV/mvn-euv-clb.xml
+++ b/NumericalData/AMDA/MAVEN/EUV/mvn-euv-clb.xml
@@ -45,7 +45,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-18T00:00:16Z</StartDate>
-             <StopDate>2017-02-14T23:59:59Z</StopDate>
+             <StopDate>2017-05-14T23:59:59Z</StopDate>
          </TimeSpan>
       <Cadence>PT60S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/EUV/mvn-euv-mod.xml b/NumericalData/AMDA/MAVEN/EUV/mvn-euv-mod.xml
index a3e6ca2..ad6dfe2 100644
--- a/NumericalData/AMDA/MAVEN/EUV/mvn-euv-mod.xml
+++ b/NumericalData/AMDA/MAVEN/EUV/mvn-euv-mod.xml
@@ -50,7 +50,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-19T00:00:00Z</StartDate>
-             <StopDate>2017-02-14T23:59:00Z</StopDate>
+             <StopDate>2017-05-14T23:59:00Z</StopDate>
          </TimeSpan>
       <Cadence>PT60S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
index 7a620d2..1c3db20 100644
--- a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
+++ b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
@@ -49,7 +49,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>2014-06-01T00:00:00Z</StartDate>
-             <StopDate>2017-08-14T23:57:01Z</StopDate>
+             <StopDate>2017-09-26T20:57:01Z</StopDate>
          </TimeSpan>
          <Cadence>PT1M</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/LPW/mav-lpw-kp.xml b/NumericalData/AMDA/MAVEN/LPW/mav-lpw-kp.xml
index 5b2f968..00ee8d6 100644
--- a/NumericalData/AMDA/MAVEN/LPW/mav-lpw-kp.xml
+++ b/NumericalData/AMDA/MAVEN/LPW/mav-lpw-kp.xml
@@ -57,7 +57,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-08T00:00:00Z</StartDate>
-             <StopDate>2017-02-14T23:59:52Z</StopDate>
+             <StopDate>2017-05-14T23:59:52Z</StopDate>
          </TimeSpan>
        <Cadence_Min>PT4S</Cadence_Min>
        <Cadence_Max>PT8S</Cadence_Max>  
diff --git a/NumericalData/AMDA/MAVEN/MAG/mav-mag-all.xml b/NumericalData/AMDA/MAVEN/MAG/mav-mag-all.xml
index bd0575d..6a9f75e 100644
--- a/NumericalData/AMDA/MAVEN/MAG/mav-mag-all.xml
+++ b/NumericalData/AMDA/MAVEN/MAG/mav-mag-all.xml
@@ -39,7 +39,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-10T00:00:00Z</StartDate>
-             <StopDate>2017-02-15T00:00:02Z</StopDate>
+             <StopDate>2017-05-15T00:00:00Z</StopDate>
          </TimeSpan>
         <Cadence>PT1S</Cadence>     
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/MAG/mav-mag-kp.xml b/NumericalData/AMDA/MAVEN/MAG/mav-mag-kp.xml
index 841f425..6276a9e 100644
--- a/NumericalData/AMDA/MAVEN/MAG/mav-mag-kp.xml
+++ b/NumericalData/AMDA/MAVEN/MAG/mav-mag-kp.xml
@@ -44,7 +44,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-10T00:00:00Z</StartDate>
-             <StopDate>2017-02-14T23:59:52Z</StopDate>
+             <StopDate>2017-05-14T23:59:52Z</StopDate>
          </TimeSpan>
        <Cadence_Min>PT4S</Cadence_Min>
        <Cadence_Max>PT8S</Cadence_Max>  
diff --git a/NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml b/NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml
index 0ee4b72..56f8b0f 100644
--- a/NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml
+++ b/NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml
@@ -44,7 +44,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-10T00:00:00Z</StartDate>
-             <StopDate>2017-02-15T00:00:02Z</StopDate>
+             <StopDate>2017-05-15T00:00:00Z</StopDate>
          </TimeSpan>
         <Cadence>PT0.031S</Cadence>     
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/NGIMS/mav-ngims-kp.xml b/NumericalData/AMDA/MAVEN/NGIMS/mav-ngims-kp.xml
index 3a49eb2..1f31796 100644
--- a/NumericalData/AMDA/MAVEN/NGIMS/mav-ngims-kp.xml
+++ b/NumericalData/AMDA/MAVEN/NGIMS/mav-ngims-kp.xml
@@ -47,7 +47,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-18T00:00:00Z</StartDate>
-             <StopDate>2017-02-14T23:59:52Z</StopDate>
+             <StopDate>2017-05-14T23:59:52Z</StopDate>
          </TimeSpan>
        <Cadence_Min>PT4S</Cadence_Min>
        <Cadence_Max>PT8S</Cadence_Max>  
diff --git a/NumericalData/AMDA/MAVEN/SEP/mav-sep1-anc.xml b/NumericalData/AMDA/MAVEN/SEP/mav-sep1-anc.xml
index fd9b444..f083051 100644
--- a/NumericalData/AMDA/MAVEN/SEP/mav-sep1-anc.xml
+++ b/NumericalData/AMDA/MAVEN/SEP/mav-sep1-anc.xml
@@ -44,7 +44,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-09-20T00:00:00Z</StartDate>
-             <StopDate>2017-02-14T23:59:29Z</StopDate>
+             <StopDate>2017-05-14T23:59:29Z</StopDate>
          </TimeSpan>
          <Cadence>PT32S</Cadence>  
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/SEP/mav-sep2-anc.xml b/NumericalData/AMDA/MAVEN/SEP/mav-sep2-anc.xml
index 8fbeef2..3ddde3e 100644
--- a/NumericalData/AMDA/MAVEN/SEP/mav-sep2-anc.xml
+++ b/NumericalData/AMDA/MAVEN/SEP/mav-sep2-anc.xml
@@ -44,7 +44,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-09-20T00:00:00Z</StartDate>
-             <StopDate>2017-02-14T23:59:29Z</StopDate>
+             <StopDate>2017-05-14T23:59:29Z</StopDate>
          </TimeSpan>
          <Cadence>PT32S</Cadence>  
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/SEP/mvn-sep1-clb.xml b/NumericalData/AMDA/MAVEN/SEP/mvn-sep1-clb.xml
index 6d6c572..62e4d47 100644
--- a/NumericalData/AMDA/MAVEN/SEP/mvn-sep1-clb.xml
+++ b/NumericalData/AMDA/MAVEN/SEP/mvn-sep1-clb.xml
@@ -44,7 +44,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-09-22T19:34:31Z</StartDate>
-             <StopDate>2017-02-14T23:59:57Z</StopDate>
+             <StopDate>2017-05-15T00:00:14Z</StopDate>
          </TimeSpan>
          <Cadence_Min>PT2S</Cadence_Min>
          <Cadence_Max>PT32S</Cadence_Max>  
diff --git a/NumericalData/AMDA/MAVEN/SEP/mvn-sep2-clb.xml b/NumericalData/AMDA/MAVEN/SEP/mvn-sep2-clb.xml
index 7c878e4..d687a9e 100644
--- a/NumericalData/AMDA/MAVEN/SEP/mvn-sep2-clb.xml
+++ b/NumericalData/AMDA/MAVEN/SEP/mvn-sep2-clb.xml
@@ -44,7 +44,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-09-22T19:34:33Z</StartDate>
-             <StopDate>2017-02-15T00:00:05Z</StopDate>
+             <StopDate>2017-05-15T00:00:06Z</StopDate>
          </TimeSpan>
          <Cadence_Min>PT2S</Cadence_Min>
          <Cadence_Max>PT32S</Cadence_Max>  
diff --git a/NumericalData/AMDA/MAVEN/STATIC/mav-static-kp.xml b/NumericalData/AMDA/MAVEN/STATIC/mav-static-kp.xml
index 23cb2a4..ebc9c77 100644
--- a/NumericalData/AMDA/MAVEN/STATIC/mav-static-kp.xml
+++ b/NumericalData/AMDA/MAVEN/STATIC/mav-static-kp.xml
@@ -56,7 +56,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-06T00:00:00Z</StartDate>
-             <StopDate>2017-02-14T23:59:52Z</StopDate>
+             <StopDate>2017-05-14T23:59:52Z</StopDate>
          </TimeSpan>
        <Cadence_Min>PT4S</Cadence_Min>
        <Cadence_Max>PT8S</Cadence_Max>  
diff --git a/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml b/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml
index 51e6f47..7074d78 100644
--- a/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml
+++ b/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml
@@ -41,7 +41,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-13T00:00:20Z</StartDate>
-             <StopDate>2017-02-15T00:00:07Z</StopDate>
+             <StopDate>2017-05-15T00:00:31Z</StopDate>
          </TimeSpan>
       <Cadence>PT4S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c6.xml b/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c6.xml
index 7a7f1b8..8a05760 100644
--- a/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c6.xml
+++ b/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c6.xml
@@ -47,7 +47,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-13T00:00:04Z</StartDate>
-             <StopDate>2017-02-15T00:00:03Z</StopDate>
+             <StopDate>2017-05-15T00:00:03Z</StopDate>
          </TimeSpan>
       <Cadence>PT4S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/SWEA/mav-swea-kp.xml b/NumericalData/AMDA/MAVEN/SWEA/mav-swea-kp.xml
index d2b494e..af52790 100644
--- a/NumericalData/AMDA/MAVEN/SWEA/mav-swea-kp.xml
+++ b/NumericalData/AMDA/MAVEN/SWEA/mav-swea-kp.xml
@@ -46,7 +46,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-06T00:00:00Z</StartDate>
-             <StopDate>2017-02-14T23:59:52Z</StopDate>
+             <StopDate>2017-05-14T23:59:52Z</StopDate>
          </TimeSpan>
        <Cadence_Min>PT4S</Cadence_Min>
        <Cadence_Max>PT8S</Cadence_Max>  
diff --git a/NumericalData/AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml b/NumericalData/AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml
index 3b89738..b121d10 100644
--- a/NumericalData/AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml
+++ b/NumericalData/AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml
@@ -45,7 +45,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-03-19T14:15:52Z</StartDate>
-             <StopDate>2017-02-15T00:00:00Z</StopDate>
+             <StopDate>2017-05-15T00:00:01Z</StopDate>
          </TimeSpan>
       <Cadence>PT4S</Cadence></TemporalDescription>
       <ObservedRegion>Mars</ObservedRegion>
diff --git a/NumericalData/AMDA/MAVEN/SWIA/mav-swia-kp.xml b/NumericalData/AMDA/MAVEN/SWIA/mav-swia-kp.xml
index 1135469..cd130a4 100644
--- a/NumericalData/AMDA/MAVEN/SWIA/mav-swia-kp.xml
+++ b/NumericalData/AMDA/MAVEN/SWIA/mav-swia-kp.xml
@@ -46,7 +46,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-06T00:00:00Z</StartDate>
-             <StopDate>2017-02-14T23:59:52Z</StopDate>
+             <StopDate>2017-05-14T23:59:52Z</StopDate>
          </TimeSpan>
        <Cadence_Min>PT4S</Cadence_Min>
        <Cadence_Max>PT8S</Cadence_Max>  
diff --git a/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml b/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml
index d724c7e..125e56c 100644
--- a/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml
+++ b/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml
@@ -48,7 +48,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-03-19T14:19:43Z</StartDate>
-             <StopDate>2017-02-15T00:00:45Z</StopDate>
+             <StopDate>2017-05-15T00:00:05Z</StopDate>
          </TimeSpan>
       <Cadence>PT4S</Cadence></TemporalDescription>
       <ObservedRegion>Mars</ObservedRegion>
diff --git a/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml b/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml
index 52759e7..aaabf06 100644
--- a/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml
+++ b/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml
@@ -45,7 +45,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-03-19T14:20:43Z</StartDate>
-             <StopDate>2017-02-15T00:00:33Z</StopDate>
+             <StopDate>2017-05-15T00:00:57Z</StopDate>
          </TimeSpan>
       <Cadence>PT4S</Cadence></TemporalDescription>
       <ObservedRegion>Mars</ObservedRegion>
diff --git a/NumericalData/AMDA/MEX/ephemeris/mex-orb-mars.xml b/NumericalData/AMDA/MEX/ephemeris/mex-orb-mars.xml
index 8531518..c315c93 100644
--- a/NumericalData/AMDA/MEX/ephemeris/mex-orb-mars.xml
+++ b/NumericalData/AMDA/MEX/ephemeris/mex-orb-mars.xml
@@ -31,8 +31,8 @@
         <MeasurementType>Ephemeris</MeasurementType>
         <TemporalDescription>
             <TimeSpan>
-                <StartDate>2004-01-10T07:54:21Z</StartDate>
-                <StopDate>2017-09-04T03:50:22Z</StopDate>
+                <StartDate>2003-12-22T18:09:05Z</StartDate>
+                <StopDate>2017-07-31T21:53:02Z</StopDate>
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/OMNI/omni-5min-all.xml b/NumericalData/AMDA/OMNI/omni-5min-all.xml
index be34e0d..15992f0 100644
--- a/NumericalData/AMDA/OMNI/omni-5min-all.xml
+++ b/NumericalData/AMDA/OMNI/omni-5min-all.xml
@@ -47,7 +47,7 @@ for creating the OMNI data set.</Acknowledgement>
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>1981-01-01T00:00:00Z</StartDate>
-                <StopDate>2017-08-07T23:55:00Z</StopDate>
+                <StopDate>2017-09-25T23:55:00Z</StopDate>
             </TimeSpan>
             <Cadence>PT5M</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/OMNI/omni-hour-all.xml b/NumericalData/AMDA/OMNI/omni-hour-all.xml
index 31e59a2..2a9ea4d 100644
--- a/NumericalData/AMDA/OMNI/omni-hour-all.xml
+++ b/NumericalData/AMDA/OMNI/omni-hour-all.xml
@@ -47,7 +47,7 @@ for creating the OMNI data set.</Acknowledgement>
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>1970-01-01T00:00:00Z</StartDate>
-                <StopDate>2017-08-08T17:00:00Z</StopDate>
+                <StopDate>2017-09-26T23:00:00Z</StopDate>
             </TimeSpan>
             <Cadence>PT1H</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml b/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml
index ec6d8f4..753b9ab 100644
--- a/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml
+++ b/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml
@@ -32,7 +32,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-03-07T18:53:59Z</StartDate>
-                <StopDate>2017-08-19T18:00:23Z</StopDate>                
+                <StopDate>2017-09-30T15:13:19Z</StopDate>                
             </TimeSpan>
             <Cadence>PT96.27S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2i.xml b/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2i.xml
index 218847e..5f82ba9 100644
--- a/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2i.xml
+++ b/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2i.xml
@@ -32,7 +32,7 @@
     <TemporalDescription>
         <TimeSpan>
             <StartDate>2007-03-07T18:53:59Z</StartDate>
-            <StopDate>2017-08-19T18:00:12Z</StopDate>                
+            <StopDate>2017-09-30T15:13:10Z</StopDate>                
         </TimeSpan>
         <Cadence>PT96.27S</Cadence>
     </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/A/ESA/tha-peem-all.xml b/NumericalData/AMDA/THEMIS/A/ESA/tha-peem-all.xml
index 85e1021..5b29a8c 100644
--- a/NumericalData/AMDA/THEMIS/A/ESA/tha-peem-all.xml
+++ b/NumericalData/AMDA/THEMIS/A/ESA/tha-peem-all.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-02T00:00:30Z</StartDate>
-                <StopDate>2017-08-19T18:00:53Z</StopDate>                
+                <StopDate>2017-09-30T15:14:17Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/A/ESA/tha-peim-all.xml b/NumericalData/AMDA/THEMIS/A/ESA/tha-peim-all.xml
index 933ea4b..9fa8482 100644
--- a/NumericalData/AMDA/THEMIS/A/ESA/tha-peim-all.xml
+++ b/NumericalData/AMDA/THEMIS/A/ESA/tha-peim-all.xml
@@ -28,7 +28,7 @@
     <TemporalDescription>
         <TimeSpan>
             <StartDate>2007-08-02T00:00:30Z</StartDate>
-            <StopDate>2017-08-19T18:00:53Z</StopDate>                
+            <StopDate>2017-09-30T15:14:17Z</StopDate>                
         </TimeSpan>
         <Cadence>PT3S</Cadence>
     </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/A/ESA/tha-pot-mom.xml b/NumericalData/AMDA/THEMIS/A/ESA/tha-pot-mom.xml
index e80262f..efbbfa9 100644
--- a/NumericalData/AMDA/THEMIS/A/ESA/tha-pot-mom.xml
+++ b/NumericalData/AMDA/THEMIS/A/ESA/tha-pot-mom.xml
@@ -29,7 +29,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-02T00:00:30Z</StartDate>
-                <StopDate>2017-08-19T18:00:53Z</StopDate>                
+                <StopDate>2017-09-30T15:14:17Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all.xml b/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all.xml
index c019a2d..fef8ff3 100644
--- a/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all.xml
@@ -32,7 +32,7 @@
     <TemporalDescription>
         <TimeSpan>
             <StartDate>2007-02-17T23:36:00Z</StartDate>
-            <StopDate>2017-08-20T23:59:00Z</StopDate>                
+            <StopDate>2017-10-01T23:59:00Z</StopDate>                
         </TimeSpan>
         <Cadence>PT60S</Cadence>
     </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/A/FGM/tha-fgm-l.xml b/NumericalData/AMDA/THEMIS/A/FGM/tha-fgm-l.xml
index 5e7d1b3..1ed19ef 100644
--- a/NumericalData/AMDA/THEMIS/A/FGM/tha-fgm-l.xml
+++ b/NumericalData/AMDA/THEMIS/A/FGM/tha-fgm-l.xml
@@ -29,7 +29,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-23T03:29:29Z</StartDate>
-                <StopDate>2017-08-19T07:24:45Z</StopDate>                
+                <StopDate>2017-09-30T15:13:57Z</StopDate>                
             </TimeSpan>
             <Cadence>PT0.25S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/A/FGM/tha-fgm-s.xml b/NumericalData/AMDA/THEMIS/A/FGM/tha-fgm-s.xml
index fac33a7..ee1dbca 100644
--- a/NumericalData/AMDA/THEMIS/A/FGM/tha-fgm-s.xml
+++ b/NumericalData/AMDA/THEMIS/A/FGM/tha-fgm-s.xml
@@ -29,7 +29,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-26T23:00:35Z</StartDate>
-                <StopDate>2017-08-19T14:30:16Z</StopDate>                
+                <StopDate>2017-09-30T18:38:03Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2e.xml b/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2e.xml
index e59978b..1e429c6 100644
--- a/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2e.xml
+++ b/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2e.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-03-07T17:55:08Z</StartDate>
-                <StopDate>2017-08-19T21:22:05Z</StopDate>                
+                <StopDate>2017-09-30T14:26:31Z</StopDate>                
             </TimeSpan>
             <Cadence>PT96.27S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2i.xml b/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2i.xml
index 9450dd1..f0f9a13 100644
--- a/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2i.xml
+++ b/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2i.xml
@@ -32,7 +32,7 @@
     <TemporalDescription>
         <TimeSpan>
             <StartDate>2007-03-07T17:55:08Z</StartDate>
-            <StopDate>2017-08-19T21:22:01Z</StopDate>                
+            <StopDate>2017-09-30T14:26:26Z</StopDate>                
         </TimeSpan>
         <Cadence>PT96.27S</Cadence>
     </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/B/ESA/thb-peem-all.xml b/NumericalData/AMDA/THEMIS/B/ESA/thb-peem-all.xml
index 9f9cf50..d54c29c 100644
--- a/NumericalData/AMDA/THEMIS/B/ESA/thb-peem-all.xml
+++ b/NumericalData/AMDA/THEMIS/B/ESA/thb-peem-all.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-10T00:02:05Z</StartDate>
-                <StopDate>2017-08-19T21:23:31Z</StopDate>                
+                <StopDate>2017-09-30T14:27:27Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/B/ESA/thb-peim-all.xml b/NumericalData/AMDA/THEMIS/B/ESA/thb-peim-all.xml
index b86d23d..1c41dca 100644
--- a/NumericalData/AMDA/THEMIS/B/ESA/thb-peim-all.xml
+++ b/NumericalData/AMDA/THEMIS/B/ESA/thb-peim-all.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-10T00:02:05Z</StartDate>
-                <StopDate>2017-08-19T21:23:31Z</StopDate>                
+                <StopDate>2017-09-30T14:27:27Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/B/ESA/thb-pot-mom.xml b/NumericalData/AMDA/THEMIS/B/ESA/thb-pot-mom.xml
index bc40baf..d39ce8b 100644
--- a/NumericalData/AMDA/THEMIS/B/ESA/thb-pot-mom.xml
+++ b/NumericalData/AMDA/THEMIS/B/ESA/thb-pot-mom.xml
@@ -29,7 +29,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-10T00:02:05Z</StartDate>
-                <StopDate>2017-08-19T21:23:31Z</StopDate>                
+                <StopDate>2017-09-30T14:27:27Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all.xml b/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all.xml
index d1f6342..a3d1615 100644
--- a/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all.xml
@@ -32,7 +32,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-17T23:36:00Z</StartDate>
-                <StopDate>2017-08-20T23:59:00Z</StopDate>                
+                <StopDate>2017-10-01T23:59:00Z</StopDate>                
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/B/FGM/thb-fgm-l.xml b/NumericalData/AMDA/THEMIS/B/FGM/thb-fgm-l.xml
index dece842..90982cf 100644
--- a/NumericalData/AMDA/THEMIS/B/FGM/thb-fgm-l.xml
+++ b/NumericalData/AMDA/THEMIS/B/FGM/thb-fgm-l.xml
@@ -29,7 +29,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-24T04:42:44Z</StartDate>
-                <StopDate>2017-08-19T21:22:45Z</StopDate>                
+                <StopDate>2017-09-30T14:27:18Z</StopDate>                
             </TimeSpan>
             <Cadence>PT0.25S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/B/FGM/thb-fgm-s.xml b/NumericalData/AMDA/THEMIS/B/FGM/thb-fgm-s.xml
index 5e8de9f..8d98304 100644
--- a/NumericalData/AMDA/THEMIS/B/FGM/thb-fgm-s.xml
+++ b/NumericalData/AMDA/THEMIS/B/FGM/thb-fgm-s.xml
@@ -29,7 +29,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-26T23:26:57Z</StartDate>
-                <StopDate>2017-08-19T14:54:51Z</StopDate>                
+                <StopDate>2017-09-30T11:19:55Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2e.xml b/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2e.xml
index 6d8cc5c..903fe54 100644
--- a/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2e.xml
+++ b/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2e.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-03-07T15:58:39Z</StartDate>
-                <StopDate>2017-08-19T11:04:10Z</StopDate>                
+                <StopDate>2017-09-29T03:03:52Z</StopDate>                
             </TimeSpan>
             <Cadence>PT96.27S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2i.xml b/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2i.xml
index b7ab8c1..f401c05 100644
--- a/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2i.xml
+++ b/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2i.xml
@@ -32,7 +32,7 @@
     <TemporalDescription>
         <TimeSpan>
             <StartDate>2007-03-07T15:58:39Z</StartDate>
-            <StopDate>2017-08-19T11:04:10Z</StopDate>                
+            <StopDate>2017-09-29T03:02:09Z</StopDate>                
         </TimeSpan>
         <Cadence>PT96.27S</Cadence>
     </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/C/ESA/thc-peem-all.xml b/NumericalData/AMDA/THEMIS/C/ESA/thc-peem-all.xml
index 765504d..79c5ec2 100644
--- a/NumericalData/AMDA/THEMIS/C/ESA/thc-peem-all.xml
+++ b/NumericalData/AMDA/THEMIS/C/ESA/thc-peem-all.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-10T00:00:32Z</StartDate>
-                <StopDate>2017-08-19T11:02:57Z</StopDate>                
+                <StopDate>2017-09-29T03:02:30Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/C/ESA/thc-peim-all.xml b/NumericalData/AMDA/THEMIS/C/ESA/thc-peim-all.xml
index 0953f26..db45f5e 100644
--- a/NumericalData/AMDA/THEMIS/C/ESA/thc-peim-all.xml
+++ b/NumericalData/AMDA/THEMIS/C/ESA/thc-peim-all.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-10T00:00:32Z</StartDate>
-                <StopDate>2017-08-19T11:02:57Z</StopDate>                
+                <StopDate>2017-09-29T03:02:30Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/C/ESA/thc-pot-mom.xml b/NumericalData/AMDA/THEMIS/C/ESA/thc-pot-mom.xml
index c1be484..6ad229f 100644
--- a/NumericalData/AMDA/THEMIS/C/ESA/thc-pot-mom.xml
+++ b/NumericalData/AMDA/THEMIS/C/ESA/thc-pot-mom.xml
@@ -29,7 +29,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-10T00:00:32Z</StartDate>
-                <StopDate>2017-08-19T11:02:57Z</StopDate>                
+                <StopDate>2017-09-29T03:02:30Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/C/Ephemeris/thc-orb-all.xml b/NumericalData/AMDA/THEMIS/C/Ephemeris/thc-orb-all.xml
index 41cae70..0d87ca0 100644
--- a/NumericalData/AMDA/THEMIS/C/Ephemeris/thc-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/C/Ephemeris/thc-orb-all.xml
@@ -32,7 +32,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-17T23:36:00Z</StartDate>
-                <StopDate>2017-08-20T23:59:00Z</StopDate>                
+                <StopDate>2017-10-01T23:59:00Z</StopDate>                
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/C/FGM/thc-fgm-l.xml b/NumericalData/AMDA/THEMIS/C/FGM/thc-fgm-l.xml
index ba513be..5d1da24 100644
--- a/NumericalData/AMDA/THEMIS/C/FGM/thc-fgm-l.xml
+++ b/NumericalData/AMDA/THEMIS/C/FGM/thc-fgm-l.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-22T23:17:57Z</StartDate>
-                <StopDate>2017-08-19T04:50:54Z</StopDate>                
+                <StopDate>2017-09-28T19:20:46Z</StopDate>                
             </TimeSpan>
             <Cadence>PT0.25S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/C/FGM/thc-fgm-s.xml b/NumericalData/AMDA/THEMIS/C/FGM/thc-fgm-s.xml
index badf768..f44d6eb 100644
--- a/NumericalData/AMDA/THEMIS/C/FGM/thc-fgm-s.xml
+++ b/NumericalData/AMDA/THEMIS/C/FGM/thc-fgm-s.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-26T22:17:50Z</StartDate>
-                <StopDate>2017-08-19T05:38:02Z</StopDate>                
+                <StopDate>2017-09-28T21:40:44Z</StopDate>                
             </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2e.xml b/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2e.xml
index 7a054ef..6e06dea 100644
--- a/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2e.xml
+++ b/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2e.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-03-07T16:54:49Z</StartDate>
-                <StopDate>2017-08-19T20:53:38Z</StopDate>                
+                <StopDate>2017-09-30T22:06:47Z</StopDate>                
             </TimeSpan>
             <Cadence>PT96.27S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2i.xml b/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2i.xml
index 96e9b17..af509af 100644
--- a/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2i.xml
+++ b/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2i.xml
@@ -32,7 +32,7 @@
     <TemporalDescription>
         <TimeSpan>
             <StartDate>2007-03-07T16:54:49Z</StartDate>
-            <StopDate>2017-08-19T20:54:16Z</StopDate>                
+            <StopDate>2017-09-30T22:06:47Z</StopDate>                
         </TimeSpan>
         <Cadence>PT96.27S</Cadence>
     </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/D/ESA/thd-peem-all.xml b/NumericalData/AMDA/THEMIS/D/ESA/thd-peem-all.xml
index 2b0e849..189b4c5 100644
--- a/NumericalData/AMDA/THEMIS/D/ESA/thd-peem-all.xml
+++ b/NumericalData/AMDA/THEMIS/D/ESA/thd-peem-all.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-09T23:59:56Z</StartDate>
-                <StopDate>2017-08-18T23:15:39Z</StopDate>                
+                <StopDate>2017-09-30T22:07:44Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/D/ESA/thd-peim-all.xml b/NumericalData/AMDA/THEMIS/D/ESA/thd-peim-all.xml
index 451cf31..4d54900 100644
--- a/NumericalData/AMDA/THEMIS/D/ESA/thd-peim-all.xml
+++ b/NumericalData/AMDA/THEMIS/D/ESA/thd-peim-all.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-09T23:59:56Z</StartDate>
-                <StopDate>2017-08-18T23:15:39Z</StopDate>                
+                <StopDate>2017-09-30T22:07:44Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/D/ESA/thd-pot-mom.xml b/NumericalData/AMDA/THEMIS/D/ESA/thd-pot-mom.xml
index 5352d1a..0bb3ccc 100644
--- a/NumericalData/AMDA/THEMIS/D/ESA/thd-pot-mom.xml
+++ b/NumericalData/AMDA/THEMIS/D/ESA/thd-pot-mom.xml
@@ -29,7 +29,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-09T23:59:56Z</StartDate>
-                <StopDate>2017-08-18T23:15:39Z</StopDate>                
+                <StopDate>2017-09-30T22:07:44Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all.xml b/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all.xml
index 6175b8e..f450e90 100644
--- a/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all.xml
@@ -32,7 +32,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-17T23:36:00Z</StartDate>
-                <StopDate>2017-08-20T23:59:00Z</StopDate>                
+                <StopDate>2017-10-01T23:59:00Z</StopDate>                
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/D/FGM/thd-fgm-l.xml b/NumericalData/AMDA/THEMIS/D/FGM/thd-fgm-l.xml
index 5b00865..b1b3b20 100644
--- a/NumericalData/AMDA/THEMIS/D/FGM/thd-fgm-l.xml
+++ b/NumericalData/AMDA/THEMIS/D/FGM/thd-fgm-l.xml
@@ -29,7 +29,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-23T01:31:22Z</StartDate>
-                <StopDate>2017-08-19T20:54:27Z</StopDate>                
+                <StopDate>2017-09-30T22:07:23Z</StopDate>                
             </TimeSpan>
             <Cadence>PT0.25S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/D/FGM/thd-fgm-s.xml b/NumericalData/AMDA/THEMIS/D/FGM/thd-fgm-s.xml
index 8049184..7b14af6 100644
--- a/NumericalData/AMDA/THEMIS/D/FGM/thd-fgm-s.xml
+++ b/NumericalData/AMDA/THEMIS/D/FGM/thd-fgm-s.xml
@@ -29,7 +29,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-28T02:55:28Z</StartDate>
-                <StopDate>2017-08-19T18:29:29Z</StopDate>                
+                <StopDate>2017-09-30T19:40:26Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2e.xml b/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2e.xml
index e6d292b..a6ed2d0 100644
--- a/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2e.xml
+++ b/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2e.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-03-07T19:54:48Z</StartDate>
-                <StopDate>2017-08-18T21:05:14Z</StopDate>                
+                <StopDate>2017-09-29T21:29:32Z</StopDate>                
             </TimeSpan>
             <Cadence>PT96.27S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2i.xml b/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2i.xml
index 4de53a8..7a9e295 100644
--- a/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2i.xml
+++ b/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2i.xml
@@ -32,7 +32,7 @@
     <TemporalDescription>
         <TimeSpan>
             <StartDate>2007-03-07T19:54:48Z</StartDate>
-            <StopDate>2017-08-18T21:05:48Z</StopDate>                
+            <StopDate>2017-09-29T21:32:05Z</StopDate>                
         </TimeSpan>
         <Cadence>PT96.27S</Cadence>
     </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/E/ESA/the-peem-all.xml b/NumericalData/AMDA/THEMIS/E/ESA/the-peem-all.xml
index 32b1a3d..6512bf6 100644
--- a/NumericalData/AMDA/THEMIS/E/ESA/the-peem-all.xml
+++ b/NumericalData/AMDA/THEMIS/E/ESA/the-peem-all.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-10T00:00:17Z</StartDate>
-                <StopDate>2017-08-18T21:07:04Z</StopDate>                
+                <StopDate>2017-09-29T21:31:10Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/E/ESA/the-peim-all.xml b/NumericalData/AMDA/THEMIS/E/ESA/the-peim-all.xml
index 555520f..02b1eb3 100644
--- a/NumericalData/AMDA/THEMIS/E/ESA/the-peim-all.xml
+++ b/NumericalData/AMDA/THEMIS/E/ESA/the-peim-all.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-10T00:00:17Z</StartDate>
-                <StopDate>2017-08-18T21:07:04Z</StopDate>                
+                <StopDate>2017-09-29T21:31:10Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/E/ESA/the-pot-mom.xml b/NumericalData/AMDA/THEMIS/E/ESA/the-pot-mom.xml
index d8f21b2..2cceadf 100644
--- a/NumericalData/AMDA/THEMIS/E/ESA/the-pot-mom.xml
+++ b/NumericalData/AMDA/THEMIS/E/ESA/the-pot-mom.xml
@@ -29,7 +29,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-08-10T00:00:17Z</StartDate>
-                <StopDate>2017-08-18T21:07:04Z</StopDate>                
+                <StopDate>2017-09-29T21:31:10Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all.xml b/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all.xml
index 0ed589f..551a53a 100644
--- a/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all.xml
@@ -32,7 +32,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-17T23:36:00Z</StartDate>
-                <StopDate>2017-08-19T23:59:00Z</StopDate>                
+                <StopDate>2017-10-01T23:59:00Z</StopDate>                
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/E/FGM/the-fgm-l.xml b/NumericalData/AMDA/THEMIS/E/FGM/the-fgm-l.xml
index df03f46..005204f 100644
--- a/NumericalData/AMDA/THEMIS/E/FGM/the-fgm-l.xml
+++ b/NumericalData/AMDA/THEMIS/E/FGM/the-fgm-l.xml
@@ -28,7 +28,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-23T02:29:39Z</StartDate>
-                <StopDate>2017-08-18T21:05:38Z</StopDate>                
+                <StopDate>2017-10-01T00:59:33Z</StopDate>                
             </TimeSpan>
             <Cadence>PT0.25S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/E/FGM/the-fgm-s.xml b/NumericalData/AMDA/THEMIS/E/FGM/the-fgm-s.xml
index b1e3f15..b266402 100644
--- a/NumericalData/AMDA/THEMIS/E/FGM/the-fgm-s.xml
+++ b/NumericalData/AMDA/THEMIS/E/FGM/the-fgm-s.xml
@@ -29,7 +29,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-28T05:17:46Z</StartDate>
-                <StopDate>2017-08-18T16:32:03Z</StopDate>                
+                <StopDate>2017-09-30T22:21:04Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-sw.xml b/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-sw.xml
index 977e565..019d654 100644
--- a/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-sw.xml
+++ b/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-sw.xml
@@ -43,7 +43,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1990-01-01T01:00:00Z</StartDate>
-            <StopDate>2017-07-19T00:00:00Z</StopDate>
+            <StopDate>2017-09-10T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml b/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml
index 722652a..36ed7bb 100644
--- a/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml
+++ b/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml
@@ -42,8 +42,8 @@
       <MeasurementType>ThermalPlasma</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
-            <StartDate>2017-07-04T00:00:00Z</StartDate>
-            <StopDate>2017-08-20T00:00:00Z</StopDate>
+            <StartDate>2017-07-12T00:00:00Z</StartDate>
+            <StopDate>2017-11-21T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Mars/tao-mars-sw.xml b/NumericalOutput/AMDA/TAO/Mars/tao-mars-sw.xml
index ca5c7ca..b9ee700 100644
--- a/NumericalOutput/AMDA/TAO/Mars/tao-mars-sw.xml
+++ b/NumericalOutput/AMDA/TAO/Mars/tao-mars-sw.xml
@@ -43,7 +43,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1990-01-01T01:00:00Z</StartDate>
-            <StopDate>2017-07-19T00:00:00Z</StopDate>
+            <StopDate>2017-09-10T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml b/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml
index 659fef8..f4823e4 100644
--- a/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml
+++ b/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml
@@ -42,8 +42,8 @@
       <MeasurementType>ThermalPlasma</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
-            <StartDate>2017-07-04T00:00:00Z</StartDate>
-            <StopDate>2017-08-20T00:00:00Z</StopDate>
+            <StartDate>2017-07-12T00:00:00Z</StartDate>
+            <StopDate>2017-10-20T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Mercury/tao-mercury-sw.xml b/NumericalOutput/AMDA/TAO/Mercury/tao-mercury-sw.xml
index 1516c5b..c23b96e 100644
--- a/NumericalOutput/AMDA/TAO/Mercury/tao-mercury-sw.xml
+++ b/NumericalOutput/AMDA/TAO/Mercury/tao-mercury-sw.xml
@@ -43,7 +43,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1990-01-01T01:00:00Z</StartDate>
-            <StopDate>2017-07-19T00:00:00Z</StopDate>
+            <StopDate>2017-09-10T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Saturn/tao-sat-sw.xml b/NumericalOutput/AMDA/TAO/Saturn/tao-sat-sw.xml
index 347b1bd..78c3e79 100644
--- a/NumericalOutput/AMDA/TAO/Saturn/tao-sat-sw.xml
+++ b/NumericalOutput/AMDA/TAO/Saturn/tao-sat-sw.xml
@@ -43,7 +43,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1990-01-01T01:30:00Z</StartDate>
-            <StopDate>2017-07-19T00:00:00Z</StopDate>
+            <StopDate>2017-09-10T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Venus/tao-venus-sw.xml b/NumericalOutput/AMDA/TAO/Venus/tao-venus-sw.xml
index fc8447a..d26617b 100644
--- a/NumericalOutput/AMDA/TAO/Venus/tao-venus-sw.xml
+++ b/NumericalOutput/AMDA/TAO/Venus/tao-venus-sw.xml
@@ -43,7 +43,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1990-01-01T01:00:00Z</StartDate>
-            <StopDate>2017-07-19T00:00:00Z</StopDate>
+            <StopDate>2017-09-10T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
--
libgit2 0.21.2