diff --git a/Instrument/CDPP-AMDA/MESSENGER/Models.xml b/Instrument/CDPP-AMDA/MESSENGER/Models.xml
new file mode 100644
index 0000000..9dba692
--- /dev/null
+++ b/Instrument/CDPP-AMDA/MESSENGER/Models.xml
@@ -0,0 +1,19 @@
+<Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
+  <Version>2.4.1</Version>
+  <Instrument>
+    <ResourceID>spase://CNES/Instrument/CDPP-AMDA/MESSENGER/Models</ResourceID>
+    <ResourceHeader>
+      <ResourceName>Analytical Models</ResourceName>
+      <AlternateName>KT17: Mercury magnetic field model</AlternateName>
+      <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
+      <Description>ToDo</Description>
+      <Contact>
+        <!-- <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
+        <Role>PrincipalInvestigator</Role> -->
+      </Contact>  
+    </ResourceHeader>
+    <InstrumentType>Platform</InstrumentType>
+    <InvestigationName/>
+    <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/MESSENGER</ObservatoryID>
+  </Instrument>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-model.xml b/NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-model.xml
new file mode 100644
index 0000000..a2fb3af
--- /dev/null
+++ b/NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-model.xml
@@ -0,0 +1,212 @@
+<?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://www.spase-group.org/data/schema/spase-2.4.1.xsd">
+  <Version>2.4.1</Version>
+  <NumericalData>
+    <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-model</ResourceID>
+    <ResourceHeader>
+      <ResourceName>KT17 @PDS</ResourceName>
+      <AlternateName>KT17 @PDS</AlternateName>
+      <ReleaseDate>2023-02-20T01:01:36Z</ReleaseDate>
+      <Description>Magnetic field along Mercury orbit is being real-time calculated.          
+            
+            
+         </Description>
+      <Acknowledgement>TBD</Acknowledgement>
+      <Contact>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
+        <Role>PrincipalInvestigator</Role>
+      </Contact>
+      <!-- <Contact>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/YWang</PersonID>
+        <Role>TechnicalContact</Role>
+      </Contact> -->
+      <PriorID></PriorID>
+    </ResourceHeader>
+    <AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
+    <AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
+    <ProviderName>IRAP</ProviderName>
+    <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/MESSENGER/Models</InstrumentID>
+    <MeasurementType>MagneticField</MeasurementType>
+    <TemporalDescription>
+      <TimeSpan>
+        <StartDate>2016-06-01T00:00:00Z</StartDate>
+        <StopDate>2021-05-05T23:49:59Z</StopDate>
+      </TimeSpan>
+      <Cadence>PT1M</Cadence>
+    </TemporalDescription>
+    <ObservedRegion>Mercury</ObservedRegion>
+    <Caveats/>
+    <Parameter>
+      <Name>b_mso internal</Name>
+      <ParameterKey>b_kt17_internal</ParameterKey>
+      <Description/>
+      <UCD/>
+      <Units>nT</Units>
+      <UnitsConversion/>
+      <Structure>
+        <Size>3</Size>
+        <Element>
+          <Name>bx</Name>
+          <Qualifier>Component.I</Qualifier>
+          <Index>1</Index>
+          <ParameterKey>b_kt17_internal(0)</ParameterKey>
+        </Element>
+        <Element>
+          <Name>by</Name>
+          <Qualifier>Component.J</Qualifier>
+          <Index>2</Index>
+          <ParameterKey>b_kt17_internal(1)</ParameterKey>
+        </Element>
+        <Element>
+          <Name>bz</Name>
+          <Qualifier>Component.K</Qualifier>
+          <Index>3</Index>
+          <ParameterKey>b_kt17_internal(2)</ParameterKey>
+        </Element>
+      </Structure>
+      <Field>
+        <FieldQuantity>Magnetic</FieldQuantity>
+      </Field>
+    </Parameter>
+    <Parameter>
+      <Name>|b|</Name>
+      <ParameterKey>b_kt17_internal_tot</ParameterKey>
+      <Description/>
+      <UCD/>
+      <Units>nT</Units>
+      <Field>
+        <FieldQuantity>Magnetic</FieldQuantity>
+      </Field>
+    </Parameter>
+    <Parameter>
+      <Name>b_mso external</Name>
+      <ParameterKey>b_kt17_external</ParameterKey>
+      <Description/>
+      <UCD/>
+      <Units>nT</Units>
+      <UnitsConversion/>
+      <Structure>
+        <Size>3</Size>
+        <Element>
+          <Name>bx</Name>
+          <Qualifier>Component.I</Qualifier>
+          <Index>1</Index>
+          <ParameterKey>b_kt17_external(0)</ParameterKey>
+        </Element>
+        <Element>
+          <Name>by</Name>
+          <Qualifier>Component.J</Qualifier>
+          <Index>2</Index>
+          <ParameterKey>b_kt17_external(1)</ParameterKey>
+        </Element>
+        <Element>
+          <Name>bz</Name>
+          <Qualifier>Component.K</Qualifier>
+          <Index>3</Index>
+          <ParameterKey>b_kt17_external(2)</ParameterKey>
+        </Element>
+      </Structure>
+      <Field>
+        <FieldQuantity>Magnetic</FieldQuantity>
+      </Field>
+    </Parameter>
+    <Parameter>
+      <Name>|b|</Name>
+      <ParameterKey>b_kt17_external_tot</ParameterKey>
+      <Description/>
+      <UCD/>
+      <Units>nT</Units>
+      <Field>
+        <FieldQuantity>Magnetic</FieldQuantity>
+      </Field>
+    </Parameter>
+    <Parameter>
+      <Name>b_mso all</Name>
+      <ParameterKey>b_kt17_all</ParameterKey>
+      <Description/>
+      <UCD/>
+      <Units>nT</Units>
+      <UnitsConversion/>
+      <Structure>
+        <Size>3</Size>
+        <Element>
+          <Name>bx</Name>
+          <Qualifier>Component.I</Qualifier>
+          <Index>1</Index>
+          <ParameterKey>b_kt17_all(0)</ParameterKey>
+        </Element>
+        <Element>
+          <Name>by</Name>
+          <Qualifier>Component.J</Qualifier>
+          <Index>2</Index>
+          <ParameterKey>b_kt17_all(1)</ParameterKey>
+        </Element>
+        <Element>
+          <Name>bz</Name>
+          <Qualifier>Component.K</Qualifier>
+          <Index>3</Index>
+          <ParameterKey>b_kt17_all(2)</ParameterKey>
+        </Element>
+      </Structure>
+      <Field>
+        <FieldQuantity>Magnetic</FieldQuantity>
+      </Field>
+    </Parameter>
+    <Parameter>
+      <Name>|b|</Name>
+      <ParameterKey>b_kt17_all_tot</ParameterKey>
+      <Description/>
+      <UCD/>
+      <Units>nT</Units>
+      <Field>
+        <FieldQuantity>Magnetic</FieldQuantity>
+      </Field>
+    </Parameter>
+    <Parameter>
+      <Name>distance mercury-sun</Name>
+      <ParameterKey>b_kt17_rhel</ParameterKey>
+      <Description/>
+      <UCD/>
+      <Units>nT</Units>
+      <Field>
+        <FieldQuantity>Magnetic</FieldQuantity>
+      </Field>
+    </Parameter>
+    <Parameter>
+      <Name>disturbance index</Name>
+      <ParameterKey>b_kt17_actIdx</ParameterKey>
+      <Description/>
+      <UCD/>
+      <Units>nT</Units>
+      <Field>
+        <FieldQuantity>Magnetic</FieldQuantity>
+      </Field>
+    </Parameter>
+  </NumericalData>
+</Spase>
diff --git a/NumericalOutput/CDPP-AMDA/KT17/b_kt17.xml b/NumericalOutput/CDPP-AMDA/KT17/b_kt17.xml
new file mode 100644
index 0000000..5dc36ed
--- /dev/null
+++ b/NumericalOutput/CDPP-AMDA/KT17/b_kt17.xml
@@ -0,0 +1,120 @@
+<?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-sim-1_0_0.xsd">
+  <Version>2.2.6</Version>
+  <NumericalOutput>
+    <ResourceID>spase://CNES/NumericalOutput/CDPP-AMDA/KT17/b_kt17</ResourceID>
+    <ResourceHeader>
+      <ResourceName>KT17 along s/c orbit</ResourceName>
+      <ReleaseDate>2023-02-17T00:00:00Z</ReleaseDate>
+      <Description>Magnetic field along s/c orbit is being real-time calculated. 
+         S/C and sampling time should be defined by user. 
+      </Description>
+      <Acknowledgement/>
+      <Contact>
+        <!-- <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
+        <Role>PrincipalInvestigator</Role>
+      </Contact>
+      <Contact>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/YWang</PersonID>
+        <Role>TechnicalContact</Role> -->
+      </Contact>
+      <InformationURL>
+        <Name>Model description</Name>
+        <URL>https://doi.org/10.1002/ggge.20242</URL>
+        <Description/>
+      </InformationURL>
+    </ResourceHeader>
+    <AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
+    <AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
+    <SimulationRunID>spase://CNES/SimulationRun/CDPP-AMDA/KT17/KT17Run</SimulationRunID>
+    <MeasurementType>MagneticField</MeasurementType>
+    <TemporalDescription>
+      <TimeSpan>
+        <StartDate>MissionDependent</StartDate>
+        <StopDate/>
+      </TimeSpan>
+      <Cadence>PTUserDefined</Cadence>
+    </TemporalDescription>
+    <SimulatedRegion>Mercury</SimulatedRegion>
+    <Caveats/>
+    <InputResourceID/>
+    <Parameter>
+      <Name>b msm @@orbit@@</Name>
+      <ParameterKey>b_kt17_model</ParameterKey>
+      <Description/>
+      <Units>nT</Units>
+      <Structure>
+        <Size>3</Size>
+        <Element>
+          <Name>bx</Name>
+          <Qualifier>Component.I</Qualifier>
+          <Index>1</Index>
+          <ParameterKey>b_kt17_model(0)</ParameterKey>
+          <ValidMin/>
+          <ValidMax/>
+        </Element>
+        <Element>
+          <Name>by</Name>
+          <Qualifier>Component.J</Qualifier>
+          <Index>2</Index>
+          <ParameterKey>b_kt17_model(1)</ParameterKey>
+          <ValidMin/>
+          <ValidMax/>
+        </Element>
+        <Element>
+          <Name>bz</Name>
+          <Qualifier>Component.K</Qualifier>
+          <Index>3</Index>
+          <ParameterKey>b_kt17_model(2)</ParameterKey>
+          <ValidMin/>
+          <ValidMax/>
+          <FillValue/>
+        </Element>
+      </Structure>
+      <Field>
+        <FieldQuantity>Magnetic</FieldQuantity>
+      </Field>
+    </Parameter>
+    <Parameter>
+      <Name>|b|</Name>
+      <ParameterKey>b_kt17_model_tot</ParameterKey>
+      <Description>Scalar magnitude of the magnetic field in nT</Description>
+      <Ucd>phys.magField</Ucd>
+      <Units>nT</Units>
+      <UnitsConversion>1e-9&gt;T</UnitsConversion>
+      <RenderingHints>
+        <DisplayType>TimeSeries</DisplayType>
+      </RenderingHints>
+      <Field>
+        <Qualifier>Magnitude</Qualifier>
+        <FieldQuantity>Magnetic</FieldQuantity>
+      </Field>
+    </Parameter>
+  </NumericalOutput>
+</Spase>
diff --git a/SimulationModel/CDPP-AMDA/KT17.xml b/SimulationModel/CDPP-AMDA/KT17.xml
new file mode 100644
index 0000000..3ef2e12
--- /dev/null
+++ b/SimulationModel/CDPP-AMDA/KT17.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Spase 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-sim-1_0_0.xsd" xmlns="http://www.spase-group.org/data/schema">
+    <Version>2.2.6</Version>
+    <SimulationModel>
+        <ResourceID>spase://CNES/SimulationModel/CDPP-AMDA/KT17</ResourceID>
+        <ResourceHeader>
+            <ResourceName>KT17</ResourceName>
+            <AlternateName>Mercury Magnetic Field Model KT17</AlternateName>
+            <ReleaseDate>2023-02-17T14:48:29Z</ReleaseDate>
+            <Description>Spherical Harmonic</Description>
+            <Contact>
+		<!-- <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
+                <Role>PrincipalInvestigator</Role> -->
+            </Contact>
+           <Association>
+               <AssociationID>Model_Magnetic_Field</AssociationID>
+               <AssociationType>PartOf</AssociationType>
+               <Note>Magnetic Field Models</Note>
+           </Association>
+        </ResourceHeader> 
+        <SimulationType>SphericalHarmonic</SimulationType>        
+    </SimulationModel>
+</Spase>
diff --git a/SimulationRun/CDPP-AMDA/KT17/KT17Run.xml b/SimulationRun/CDPP-AMDA/KT17/KT17Run.xml
new file mode 100644
index 0000000..c5b46e6
--- /dev/null
+++ b/SimulationRun/CDPP-AMDA/KT17/KT17Run.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Spase 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-sim-1_0_0.xsd" xmlns="http://www.spase-group.org/data/schema">
+ <Version>2.2.6</Version>
+    <SimulationRun>
+        <ResourceID>spase://CNES/SimulationRun/CDPP-AMDA/KT17/KT17Run</ResourceID>
+        <ResourceHeader>
+            <ResourceName>KT17 Model</ResourceName>
+            <AlternateName></AlternateName>
+            <ReleaseDate>2023-02-17T14:48:29Z</ReleaseDate>
+            <Description>A model of the magnetic field of Mercury.</Description>
+            <Contact>
+                <!-- <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
+                <Role>PrincipalInvestigator</Role> -->
+            </Contact>             
+        </ResourceHeader>
+        <Model>
+            <ModelID>spase://CNES/SimulationModel/CDPP-AMDA/KT17</ModelID>
+        </Model> 
+        <SimulatedRegion>Mercury</SimulatedRegion>        
+        <SimulationDomain>
+            <CoordinateSystem>
+                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
+                <CoordinateSystemName>MSM</CoordinateSystemName>
+            </CoordinateSystem>            
+            <SpatialDimension>3</SpatialDimension>
+            <Units>Rm</Units>
+        </SimulationDomain>
+        <InputParameter>
+            <Name>Orbit</Name> 
+            <Property>
+                <PropertyQuantity>Ephemeris</PropertyQuantity>
+            </Property>             
+        </InputParameter>
+    </SimulationRun>
+</Spase>
--
libgit2 0.21.2