diff --git a/Instrument/CDPP-AMDA/Geotail/CPI.xml b/Instrument/CDPP-AMDA/Geotail/CPI.xml
new file mode 100644
index 0000000..d5d376d
--- /dev/null
+++ b/Instrument/CDPP-AMDA/Geotail/CPI.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
+  <Version>2.3.1</Version>
+  <Instrument>
+    <ResourceID>spase://CNES/Instrument/CDPP-AMDA/Geotail/CPI</ResourceID>
+    <ResourceHeader>
+      <ResourceName>CPI</ResourceName>
+      <AlternateName>Geotail Comprehensive Plasma Instrumentation</AlternateName>
+      <ReleaseDate>2019-05-05T12:34:56.789</ReleaseDate>
+      <Description>
+        The objective of the Comprehensive Plasma Instrumentation (CPI) investigation is to make comprehensive observations  
+        of the three-dimensional velocity distribution functions of electrons and positive ions, with identification of ion species.  
+        The instrument contains three sets of quadrispherical analyzers with channel electron multipliers.  
+        These three obtain three-dimensional measurements for hot plasma and solar wind electrons, for solar wind ions,  
+        and for positive-ion composition measurements. The positive-ion composition measurement of the Ion Composition  
+        (IC) analyzer includes five miniature imaging mass spectrometers at the exit aperture of the analyzer, and covers  
+        masses from 1 to 550 u/Q at 100 eV, and 1 to 55 u/Q at 10 keV. The Hot Plasma (HP) analyzer measures electrons and ions  
+        in the range 1-50,000 eV/Q. The Solar Wind (SW) analyzer measures ions from 150 to 7,000 eV/Q.  
+        Sequencing of the energy analyzers and mass spectrometers, and other control functions, are provided by two microprocessors. 
+      </Description>
+      <Contact>
+        <PersonID>spase://SMWG/Person/Louis.A.Frank</PersonID>
+        <Role>PrincipalInvestigator</Role>
+      </Contact>
+      <InformationURL>
+        <Name>NSSDC's Master Catalog</Name>
+        <URL>https://nssdc.gsfc.nasa.gov/nmc/experiment/display.action?id=1992-044A-04</URL>
+        <Description>Information about the Comprehensive Plasma Instrument</Description>
+      </InformationURL> 
+    </ResourceHeader>
+    <InstrumentType>QuadrisphericalAnalyser</InstrumentType>
+    <InvestigationName>CPI on GEOTAIL</InvestigationName>
+    <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/Geotail</ObservatoryID>
+  </Instrument>
+</Spase>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/CPI/gtl_cpi_swa.xml b/NumericalData/CDPP-AMDA/GEOTAIL/CPI/gtl_cpi_swa.xml
new file mode 100644
index 0000000..899d1b4
--- /dev/null
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/CPI/gtl_cpi_swa.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
+    <Version>2.3.1</Version>
+    <NumericalData>
+        <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Geotail/CPI/gtl-cpi-swa</ResourceID>
+        <ResourceHeader>
+            <ResourceName>SWA</ResourceName>
+            <AlternateName>Solar Wind Analyser</AlternateName>
+            <ReleaseDate>2019-05-05T12:34:56Z</ReleaseDate>
+            <Description>
+                The Solar Wind Analyzer (SWA) of the Comprehensive Plasma Instrumentation (CPI) on Geotail is a quadrispherical plasma analyzer  
+                that measures three-dimensional fluxes of ions in the range 150-7,000 eV/Q.  
+                Version 6 data processing replaced version 5 processing for data after March 10,
+                2006, when the CPI team started using 64 energy steps per spectrum instead of 
+                the previously used 32 steps per spectrum.  The change was made to ensure that 
+                even for very cold flows, the spectrum would have a sufficient number of 
+                significant points to derive moments.  The change resulted in 96s spectra and 
+                96s-resolution moments, vs. 48s previously.
+            </Description>
+            <Acknowledgement>In any publications, the use of the Geotail data should be acknowledged"</Acknowledgement>
+            <Contact>
+                <PersonID>spase://SMWG/Person/Louis.A.Frank</PersonID>
+                <Role>PrincipalInvestigator</Role>
+            </Contact>
+            <Contact>
+                <PersonID>spase://SMWG/Person/William.R.Paterson</PersonID>
+                <Role>GeneralContact</Role>
+            </Contact>
+        </ResourceHeader>
+        <AccessInformation>
+            <RepositoryID>spase://SMWG/Repository/CNES/CDPP-AMDA</RepositoryID>
+            <Availability>Online</Availability>
+            <AccessRights>Open</AccessRights>
+            <AccessURL>
+                <Name>AMDA at CDPP</Name>
+                <URL>http://amda.cdpp.eu</URL>
+            </AccessURL> 
+            <Format>NetCDF</Format>
+            <Encoding>None</Encoding>
+            <Acknowledgement>Data provider DARTS at Institute of Space and Astronautical Science, JAXA in Japan</Acknowledgement>
+        </AccessInformation>
+        <ProviderName>CDAweb</ProviderName>
+        <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Geotail/CPI</InstrumentID>
+        <MeasurementType>EnergeticParticles</MeasurementType>
+        <TemporalDescription>
+            <TimeSpan>
+                <StartDate>1992-09-28T00:00:02Z</StartDate>
+                <StopDate>2019-06-26T23:59:28Z</StopDate>
+            </TimeSpan>
+            <Cadence>PT96S</Cadence>
+        </TemporalDescription>       
+        <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
+        <ObservedRegion>Earth.Magnetosphere</ObservedRegion>
+        <ObservedRegion>Earth.Magnetosphere.Magnetotail</ObservedRegion>
+        <Parameter>
+            <Name>v_gse</Name>
+            <ParameterKey>gtl_cpi_swa_v</ParameterKey>
+            <Description>Ion bulk flow velocity (H+ only in solar wind) in GSE cartesian coordinates</Description>
+            <Units>km/s</Units>
+            <CoordinateSystem>
+                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
+                <CoordinateSystemName>GSE</CoordinateSystemName>
+            </CoordinateSystem>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size>3</Size>
+                <Element>
+                    <Name>vx</Name>
+                    <Qualifier>Component.I</Qualifier>
+                    <Index>1</Index>
+                    <ParameterKey>gtl_cpi_swa_v(0)</ParameterKey>
+                </Element>
+                <Element>
+                    <Name>vy</Name>
+                    <Qualifier>Component.J</Qualifier>
+                    <Index>2</Index>
+                    <ParameterKey>gtl_cpi_swa_v(1)</ParameterKey>
+                </Element>
+                <Element>
+                    <Name>vz</Name>
+                    <Qualifier>Component.K</Qualifier>
+                    <Index>3</Index>
+                    <ParameterKey>gtl_cpi_swa_v(2)</ParameterKey>
+                </Element>
+            </Structure>
+        </Parameter>
+        <Parameter>
+            <Name>density</Name>
+            <ParameterKey>gtl_cpi_swa_n</ParameterKey>
+            <Description>Ion number density</Description>
+            <Caveats>Assuming no helium (0.3 - several hundred) if the density is less than 0.3/cc the higher moments (VEL,TEMP) shall not be used because of the poor counting statistics.</Caveats>
+            <Units>/cc</Units>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+        </Parameter> 
+        <Parameter>
+            <Name>temerature</Name>
+            <ParameterKey>gtl_cpi_swa_t</ParameterKey>
+            <Description>Ion average kinetic temperature</Description>
+            <Units>eV</Units>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+        </Parameter> 
+     </NumericalData>
+</Spase>
--
libgit2 0.21.2