diff --git a/NumericalData/AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-pad.xml b/NumericalData/AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-pad.xml
index 5050726..e67b639 100644
--- a/NumericalData/AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-pad.xml
+++ b/NumericalData/AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-pad.xml
@@ -4,19 +4,16 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-pad</ResourceID>
         <ResourceHeader>
-            <ResourceName>pitch angle distribution</ResourceName>
-            <AlternateName/>
+            <ResourceName>PAD</ResourceName>
+            <AlternateName>2D Pitch-Angle/Energy distribution</AlternateName>
             <ReleaseDate>2015-10-19T10:51:45Z</ReleaseDate>
-            <Description>This instrument (CIS: Cluster Ion Spectrometry) is capable of obtaining full 3D ion distributions with high time resolution (in one spacecraft spin) and mass-per-charge resolution. The experiment consists of two different instruments, a Hot Ion Analyzer (HIA) and a time-of-flight Ion Composition and Distribution Function analyzer (CODIF). Extensive on-board processing is done, within its dual-processor Data Processing System (DPS). CODIF determines the distributions of the major ion species with energies from spacecraft potential to 40 KeV/charge with an angular resolution of 22.5 x 10.25 degrees and with two different sensitivities. The CODIF instrument uses electrostatic deflection to select by energy per charge, with subsequent time-of-flight analysis. The sensor primarily covers the energy range 0.02-40 KeV/charge, but with additional pre-acceleration for energies below 25 eV/charge, the range is extended to energies as low as the spacecraft potential. The HIA does not measure mass, but extends the dynamic range to the highest ion fluxes, and has angular resolution capability of 5.6 x 5.6 degrees for ion-beam and solar-wind measurements. The HIA is a symmetric quadrispherical analyzer of top-hat geometry, and uses microchannel-plate electron multipliers and position encoding by discrete anodes. A 2D distribution is obtained once per 62.5 ms, and a full 3D distribution of ions in the energy range ~5 eV/charge to 32 KeV/charge is obtained every 4 s. For more details of the Cluster mission, the spacecraft, and its instruments, see the report Cluster: mission, payload and supporting activities, March 1993, ESA SP-1159, and the included article The Cluster Ion Spectrometry Experiment, by H. Reme et al., from which this information was obtained.</Description>
-            <Acknowledgement>NASA, Prof. Henri Reme, European Space Agency</Acknowledgement>
+            <Description>Pitch-angle distributions (PADs) are given in particle flux units, as a function of the particle energy and pitch-angle (2D distributions), and their  resolution is in 16 angular sectors covering the pitch angle range from 0° to 180°.
+            PADs are calculated for HIA magnetospheric modes. The  dataset  is  provided  with  31  energy  bins  resolution</Description>
+            <Acknowledgement>Principal Investigator: Dr. Iannis Dandouras</Acknowledgement>
             <Contact>
-                <PersonID>spase://SMWG/Person/Henri.Reme</PersonID>
+                <PersonID>spase://CDPP/Person/Jannis.Dandouras</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
-            <Contact>
-                <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
-                <Role>TechnicalContact</Role>
-            </Contact>
             <InformationURL>
                 <Name>NSSDC Master Catalog listing for Cluster II Rumba Cluster Ion Spectrometry (CIS)</Name>
                 <URL>http://nssdc.gsfc.nasa.gov/nmc/experimentDisplay.do?id=2000-045A-02</URL>
@@ -32,11 +29,10 @@
                 <URL>http://amda.cdpp.eu</URL>
             </AccessURL>
             <Format>NetCDF</Format>
-            <Acknowledgement>NASA, Prof. Henri Reme</Acknowledgement>
         </AccessInformation>
-        <ProviderName>IRAP</ProviderName>
+        <ProviderName>CSA</ProviderName>
         <ProcessingLevel>Calibrated</ProcessingLevel>
-        <ProviderResourceName>Cluster II Rumba Prime Parameter Cluster Ion Spectrometry (CIS) Data</ProviderResourceName>
+        <ProviderResourceName>C1_CP_CIS-HIA_PAD_HS_MAG_IONS_PF</ProviderResourceName>
         <ProviderProcessingLevel>Calibrated</ProviderProcessingLevel>
         <ProviderVersion>1</ProviderVersion>
         <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Rumba/CIS-HIA</InstrumentID>
@@ -71,46 +67,49 @@
         <Keyword>magnetotail</Keyword>
         <Keyword>lobe</Keyword>
         <Parameter>
-            <Name>Pitch angle distribution</Name>
+            <Name>2D pitch-angle/energy distribution</Name>
             <ParameterKey>c1_hia_pad</ParameterKey>
-            <Description/>
-            <Ucd>pos.posAng</Ucd>
+            <Description>Hot ion pitch angle distribution</Description>
+            <Ucd/>
             <Cadence>PT4S</Cadence>
             <Units>cnts/(cm2 s sr Kev)</Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
-            <Support>
-                <SupportQuantity>Other</SupportQuantity>
-            </Support>
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>NumberFlux</ParticleQuantity>                
+            </Particle>
         </Parameter>
         <Parameter>
-            <Name>Pitch angle distribution : sum over all energies</Name>
+            <Name>1D pitch-angle distribution : sum over energies</Name>
             <ParameterKey>c1_hia_pad_angle</ParameterKey>
-            <Description/>
-            <Ucd>pos.posAng</Ucd>
+            <Description>Hot ion pitch angle distribution (sum over all energy bins)</Description>
+            <Ucd/>
             <Cadence>PT4S</Cadence>
             <Units>cnts/(cm2 s sr Kev)</Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
-            <Support>
-                <SupportQuantity>Other</SupportQuantity>
-            </Support>
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>NumberFlux</ParticleQuantity>                
+            </Particle>
         </Parameter>
        <Parameter>
-            <Name>Energy distribution : sum over all pitch angles</Name>
+            <Name>1D energy distribution : sum over PA</Name>
             <ParameterKey>c1_hia_pad_energy</ParameterKey>
-            <Description/>
-            <Ucd>pos.posAng</Ucd>
+           <Description>Hot ion pitch angle distribution (sum over all angle bins)</Description>
+            <Ucd/>
             <Cadence>PT4S</Cadence>
             <Units>cnts/(cm2 s sr Kev)</Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
-            <Support>
-                <SupportQuantity>Other</SupportQuantity>
-            </Support>
+            <Particle>
+                 <ParticleType>Ion</ParticleType>
+                 <ParticleQuantity>NumberFlux</ParticleQuantity>                
+            </Particle>
         </Parameter> 
     </NumericalData>
 </Spase>
diff --git a/NumericalData/AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-mom.xml b/NumericalData/AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-mom.xml
index 38f9e63..b409094 100644
--- a/NumericalData/AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-mom.xml
+++ b/NumericalData/AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-mom.xml
@@ -43,7 +43,7 @@
         </AccessInformation>
         <ProviderName>CSA</ProviderName>
         <ProcessingLevel>Calibrated</ProcessingLevel>
-        <ProviderResourceName>c3_CP_CIS-HIA_ONBOARD_MOMENTS</ProviderResourceName>
+        <ProviderResourceName>C3_CP_CIS-HIA_ONBOARD_MOMENTS</ProviderResourceName>
         <ProviderProcessingLevel>Calibrated</ProviderProcessingLevel>
         <ProviderVersion>1</ProviderVersion>
         <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Samba/CIS-HIA</InstrumentID>
diff --git a/NumericalData/AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-pad.xml b/NumericalData/AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-pad.xml
index 04cd552..f9deb28 100644
--- a/NumericalData/AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-pad.xml
+++ b/NumericalData/AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-pad.xml
@@ -1,27 +1,24 @@
 <?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://cdpp1.cesr.fr/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
+<Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://cdpp1.cesr.fr/AMDA-NG/public/schemas/spase-amda-1_1_0.xsd">
     <Version>2.2.6</Version>
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-pad</ResourceID>
         <ResourceHeader>
-            <ResourceName>pitch angle distribution</ResourceName>
-            <AlternateName>Pitch-Angle Distribution</AlternateName>
-            <ReleaseDate>2015-10-19T15:51:45Z</ReleaseDate>
-            <Description>This instrument (CIS: Cluster Ion Spectrometry) is capable of obtaining full 3D ion distributions with high time resolution (in one spacecraft spin) and mass-per-charge resolution. The experiment consists of two different instruments, a Hot Ion Analyzer (HIA) and a time-of-flight Ion Composition and Distribution Function analyzer (CODIF). Extensive on-board processing is done, within its dual-processor Data Processing System (DPS). CODIF determines the distributions of the major ion species with energies from spacecraft potential to 40 KeV/charge with an angular resolution of 22.5 x 10.25 degrees and with two different sensitivities. The CODIF instrument uses electrostatic deflection to select by energy per charge, with subsequent time-of-flight analysis. The sensor primarily covers the energy range 0.02-40 KeV/charge, but with additional pre-acceleration for energies below 25 eV/charge, the range is extended to energies as low as the spacecraft potential. The HIA does not measure mass, but extends the dynamic range to the highest ion fluxes, and has angular resolution capability of 5.6 x 5.6 degrees for ion-beam and solar-wind measurements. The HIA is a symmetric quadrispherical analyzer of top-hat geometry, and uses microchannel-plate electron multipliers and position encoding by discrete anodes. A 2D distribution is obtained once per 62.5 ms, and a full 3D distribution of ions in the energy range ~5 eV/charge to 32 KeV/charge is obtained every 4 s. For more details of the Cluster mission, the spacecraft, and its instruments, see the report Cluster: mission, payload and supporting activities, March 1993, ESA SP-1159, and the included article The Cluster Ion Spectrometry Experiment, by H. Reme et al., from which this information was obtained.</Description>
-            <Acknowledgement>NASA, Prof. Henri Reme, European Space Agency</Acknowledgement>
+            <ResourceName>PAD</ResourceName>
+            <AlternateName>2D Pitch-Angle/Energy distribution</AlternateName>
+            <ReleaseDate>2016-10-19T10:51:45Z</ReleaseDate>
+            <Description>Pitch-angle distributions (PADs) are given in particle flux units, as a function of the particle energy and pitch-angle (2D distributions), and their  resolution is in 16 angular sectors covering the pitch angle range from 0° to 180°.
+            PADs are calculated for HIA magnetospheric modes. The  dataset  is  provided  with  31  energy  bins  resolution</Description>
+            <Acknowledgement>Principal Investigator: Dr. Iannis Dandouras</Acknowledgement>
             <Contact>
-                <PersonID>spase://SMWG/Person/Henri.Reme</PersonID>
+                <PersonID>spase://CDPP/Person/Jannis.Dandouras</PersonID>
                 <Role>PrincipalInvestigator</Role>
-            </Contact>      
-            <Contact>
-                <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
-                <Role>TechnicalContact</Role>
             </Contact>
             <InformationURL>
-                <Name>NSSDC Master Catalog listing for Cluster II Samba Cluster Ion Spectrometry (CIS)</Name>
+                <Name>NSSDC Master Catalog listing for Cluster II Rumba Cluster Ion Spectrometry (CIS)</Name>
                 <URL>http://nssdc.gsfc.nasa.gov/nmc/experimentDisplay.do?id=2000-045A-02</URL>
-                <Description>This site provides information concerning the Cluster II Samba Cluster Ion Spectrometry Instrument.</Description>
-            </InformationURL>           
+                <Description>This site provides information concerning the Cluster II Rumba Cluster Ion Spectrometry Instrument.</Description>
+            </InformationURL>
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -29,22 +26,21 @@
             <AccessRights>Open</AccessRights>
             <AccessURL>
                 <Name>AMDA at CDPP</Name>
-                <URL>http://amda.cdpp.eu</URL>                
-            </AccessURL>            
+                <URL>http://amda.cdpp.eu</URL>
+            </AccessURL>
             <Format>NetCDF</Format>
-            <Acknowledgement>NASA, Prof. Henri Reme</Acknowledgement>
         </AccessInformation>
-        <ProviderName>IRAP</ProviderName>
+        <ProviderName>CSA</ProviderName>
         <ProcessingLevel>Calibrated</ProcessingLevel>
-        <ProviderResourceName/>
+        <ProviderResourceName>C3_CP_CIS-HIA_PAD_HS_MAG_IONS_PF</ProviderResourceName>
         <ProviderProcessingLevel>Calibrated</ProviderProcessingLevel>
         <ProviderVersion>1</ProviderVersion>
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Samba/CIS-HIA</InstrumentID>
+        <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Rumba/CIS-HIA</InstrumentID>
         <MeasurementType>ThermalPlasma</MeasurementType>
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2001-01-31T01:02:10Z</StartDate>
-                <StopDate>2009-11-11T08:17:05Z</StopDate>               
+                <StopDate>2009-11-11T08:17:05Z</StopDate>
             </TimeSpan>
             <Cadence>PT4S</Cadence>
         </TemporalDescription>
@@ -69,48 +65,51 @@
         <Keyword>magnetosheath</Keyword>
         <Keyword>Cluster</Keyword>
         <Keyword>magnetotail</Keyword>
-        <Keyword>lobe</Keyword>          
+        <Keyword>lobe</Keyword>
         <Parameter>
-            <Name>Pitch angle distribution</Name>
+            <Name>2D pitch-angle/energy distribution</Name>
             <ParameterKey>c3_hia_pad</ParameterKey>
-            <Description/>
-            <Ucd>pos.posAng</Ucd>
+            <Description>Hot ion pitch angle distribution</Description>
+            <Ucd/>
             <Cadence>PT4S</Cadence>
             <Units>cnts/(cm2 s sr Kev)</Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
-            <Support>
-                <SupportQuantity>Other</SupportQuantity>
-            </Support>            
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>NumberFlux</ParticleQuantity>                
+            </Particle>
         </Parameter>
         <Parameter>
-            <Name>Pitch angle distribution : sum over all energies</Name>
+            <Name>1D pitch-angle distribution : sum over energies</Name>
             <ParameterKey>c3_hia_pad_angle</ParameterKey>
-            <Description/>
-            <Ucd>pos.posAng</Ucd>
+            <Description>Hot ion pitch angle distribution (sum over all energy bins)</Description>
+            <Ucd/>
             <Cadence>PT4S</Cadence>
             <Units>cnts/(cm2 s sr Kev)</Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
-            <Support>
-                <SupportQuantity>Other</SupportQuantity>
-            </Support>
+            <Particle>
+                <ParticleType>Ion</ParticleType>
+                <ParticleQuantity>NumberFlux</ParticleQuantity>                
+            </Particle>
         </Parameter>
-        <Parameter>
-            <Name>Energy distribution : sum over all pitch angles</Name>
+       <Parameter>
+            <Name>1D energy distribution : sum over PA</Name>
             <ParameterKey>c3_hia_pad_energy</ParameterKey>
-            <Description/>
-            <Ucd>pos.posAng</Ucd>
+           <Description>Hot ion pitch angle distribution (sum over all angle bins)</Description>
+            <Ucd/>
             <Cadence>PT4S</Cadence>
             <Units>cnts/(cm2 s sr Kev)</Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
-            <Support>
-                <SupportQuantity>Other</SupportQuantity>
-            </Support>
+            <Particle>
+                 <ParticleType>Ion</ParticleType>
+                 <ParticleQuantity>NumberFlux</ParticleQuantity>                
+            </Particle>
         </Parameter> 
     </NumericalData>
 </Spase>
--
libgit2 0.21.2