diff --git a/103120/examples/mapped/CREATE_Request.xml b/103120/examples/mapped/CREATE_Request.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8c28d345b2ad1a2973273e7748253ce7ad49a1be
--- /dev/null
+++ b/103120/examples/mapped/CREATE_Request.xml
@@ -0,0 +1,19 @@
+<HI1Object xmlns="http://uri.etsi.org/03120/common/2022/06/MappedCREATERequest"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns:Task="http://uri.etsi.org/03120/common/2020/09/Task"
+           xsi:type="Task:LITaskObject">
+  <core:ObjectIdentifier>e16265fa-2301-4a2a-a7b8-1f212506646c</core:ObjectIdentifier>
+  <Task:Reference>LIID</Task:Reference>
+  <Task:TargetIdentifier>
+    <Task:TargetIdentifierValues>
+      <Task:TargetIdentifierValue>
+        <Task:FormatType>
+          <Task:FormatOwner>ETSI</Task:FormatOwner>
+          <Task:FormatName>E.164</Task:FormatName>
+        </Task:FormatType>
+        <Task:Value>447700900123</Task:Value>
+      </Task:TargetIdentifierValue>
+    </Task:TargetIdentifierValues>
+  </Task:TargetIdentifier>
+</HI1Object>
\ No newline at end of file
diff --git a/103120/examples/mapped/CREATE_Response.xml b/103120/examples/mapped/CREATE_Response.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8e81e2421590737caec56a944f273bce15e6fdfc
--- /dev/null
+++ b/103120/examples/mapped/CREATE_Response.xml
@@ -0,0 +1,25 @@
+<HI1Object xmlns="http://uri.etsi.org/03120/common/2022/06/MappedCREATEResponse"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common"
+           xmlns:Task="http://uri.etsi.org/03120/common/2020/09/Task"
+           xsi:type="Task:LITaskObject">
+  <core:ObjectIdentifier>e16265fa-2301-4a2a-a7b8-1f212506646c</core:ObjectIdentifier>
+  <Task:Reference>LIID</Task:Reference>
+  <Task:Status>
+    <common:Owner>ETSI</common:Owner>
+    <common:Name>TaskStatus</common:Name>
+    <common:Value>Active</common:Value>
+  </Task:Status>
+  <Task:TargetIdentifier>
+    <Task:TargetIdentifierValues>
+      <Task:TargetIdentifierValue>
+        <Task:FormatType>
+          <Task:FormatOwner>ETSI</Task:FormatOwner>
+          <Task:FormatName>E.164</Task:FormatName>
+        </Task:FormatType>
+        <Task:Value>447700900123</Task:Value>
+      </Task:TargetIdentifierValue>
+    </Task:TargetIdentifierValues>
+  </Task:TargetIdentifier>
+</HI1Object>
\ No newline at end of file
diff --git a/103120/examples/mapped/DELIVER_Request.xml b/103120/examples/mapped/DELIVER_Request.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ff23a60fcdaa015b713de24775f51b79fa7586b4
--- /dev/null
+++ b/103120/examples/mapped/DELIVER_Request.xml
@@ -0,0 +1,25 @@
+<HI1Object xmlns="http://uri.etsi.org/03120/common/2022/06/MappedDELIVERRequest"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common"
+           xmlns:deliver="http://uri.etsi.org/03120/common/2019/10/Delivery"
+           xsi:type="deliver:DeliveryObject">
+  <core:ObjectIdentifier>ffac63d8-2df5-4837-84ad-5d76e2f848d6</core:ObjectIdentifier>
+  <deliver:Reference>
+    <deliver:LDID>GB-LEA-1234</deliver:LDID>
+  </deliver:Reference>
+  <deliver:DeliveryID>dcf8860f-37bd-49fa-bf11-66eea7e92728</deliver:DeliveryID>
+  <deliver:SequenceNumber>1</deliver:SequenceNumber>
+  <deliver:Manifest>
+    <deliver:Specification>
+      <common:Owner>ETSI</common:Owner>
+      <common:Name>ManifestSpecification</common:Name>
+      <common:Value>TS102657-ASN.1</common:Value>
+    </deliver:Specification>
+  </deliver:Manifest>
+  <deliver:Delivery>
+    <deliver:BinaryData>
+      <deliver:Data>RXhhbXBsZQ==</deliver:Data>
+    </deliver:BinaryData>
+  </deliver:Delivery>
+</HI1Object>
\ No newline at end of file
diff --git a/103120/examples/mapped/LIST_Response.xml b/103120/examples/mapped/LIST_Response.xml
new file mode 100644
index 0000000000000000000000000000000000000000..27c2b55d31442a6e0df2051603302dc26c4eb7c0
--- /dev/null
+++ b/103120/examples/mapped/LIST_Response.xml
@@ -0,0 +1,14 @@
+<LISTResponse xmlns="http://uri.etsi.org/03120/common/2022/06/MappedLISTResponse"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core">
+  <core:ListResponseRecord>
+    <core:ObjectType>
+      <common:Owner>ETSI</common:Owner>
+      <common:Name>ObjectType</common:Name>
+      <common:Value>Task</common:Value>
+    </core:ObjectType>
+    <core:Identifier>e16265fa-2301-4a2a-a7b8-1f212506646c</core:Identifier>
+    <core:Generation>0</core:Generation>
+  </core:ListResponseRecord>
+</LISTResponse>
\ No newline at end of file
diff --git a/103120/examples/mapped/UPDATE_Request.xml b/103120/examples/mapped/UPDATE_Request.xml
new file mode 100644
index 0000000000000000000000000000000000000000..419a374fbc9bfa1396175e65a5ff6de548e7e83d
--- /dev/null
+++ b/103120/examples/mapped/UPDATE_Request.xml
@@ -0,0 +1,19 @@
+<HI1Object xmlns="http://uri.etsi.org/03120/common/2022/06/MappedUPDATERequest"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns:Task="http://uri.etsi.org/03120/common/2020/09/Task"
+           xsi:type="Task:LITaskObject">
+  <core:ObjectIdentifier>cf5abd84-ab4d-4329-8b4d-28dd6f52e4cc</core:ObjectIdentifier>
+  <Task:Reference>LIID</Task:Reference>
+  <Task:TargetIdentifier>
+    <Task:TargetIdentifierValues>
+      <Task:TargetIdentifierValue>
+        <Task:FormatType>
+          <Task:FormatOwner>ETSI</Task:FormatOwner>
+          <Task:FormatName>E.164</Task:FormatName>
+        </Task:FormatType>
+        <Task:Value>447700900123</Task:Value>
+      </Task:TargetIdentifierValue>
+    </Task:TargetIdentifierValues>
+  </Task:TargetIdentifier>
+</HI1Object>
\ No newline at end of file
diff --git a/103120/examples/mapped/UPDATE_Response.xml b/103120/examples/mapped/UPDATE_Response.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5a8c2058bf71445aedbd4395b0efff8890e49ecd
--- /dev/null
+++ b/103120/examples/mapped/UPDATE_Response.xml
@@ -0,0 +1,19 @@
+<HI1Object xmlns="http://uri.etsi.org/03120/common/2022/06/MappedUPDATEResponse"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns:Task="http://uri.etsi.org/03120/common/2020/09/Task"
+           xsi:type="Task:LITaskObject">
+  <core:ObjectIdentifier>cf5abd84-ab4d-4329-8b4d-28dd6f52e4cc</core:ObjectIdentifier>
+  <Task:Reference>LIID</Task:Reference>
+  <Task:TargetIdentifier>
+    <Task:TargetIdentifierValues>
+      <Task:TargetIdentifierValue>
+        <Task:FormatType>
+          <Task:FormatOwner>ETSI</Task:FormatOwner>
+          <Task:FormatName>E.164</Task:FormatName>
+        </Task:FormatType>
+        <Task:Value>447700900123</Task:Value>
+      </Task:TargetIdentifierValue>
+    </Task:TargetIdentifierValues>
+  </Task:TargetIdentifier>
+</HI1Object>
\ No newline at end of file
diff --git a/103120/examples/mapped/get_response.xml b/103120/examples/mapped/get_response.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bcba12d133bf167e62774ebd216b2f03d89ad49f
--- /dev/null
+++ b/103120/examples/mapped/get_response.xml
@@ -0,0 +1,19 @@
+<HI1Object xmlns="http://uri.etsi.org/03120/common/2022/06/MappedGETResponse"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns:Task="http://uri.etsi.org/03120/common/2020/09/Task"
+           xsi:type="Task:LITaskObject">
+  <core:ObjectIdentifier>cf5abd84-ab4d-4329-8b4d-28dd6f52e4cc</core:ObjectIdentifier>
+  <Task:Reference>LIID</Task:Reference>
+  <Task:TargetIdentifier>
+    <Task:TargetIdentifierValues>
+      <Task:TargetIdentifierValue>
+        <Task:FormatType>
+          <Task:FormatOwner>ETSI</Task:FormatOwner>
+          <Task:FormatName>E.164</Task:FormatName>
+        </Task:FormatType>
+        <Task:Value>447700900123</Task:Value>
+      </Task:TargetIdentifierValue>
+    </Task:TargetIdentifierValues>
+  </Task:TargetIdentifier>
+</HI1Object>
\ No newline at end of file
diff --git a/103120/examples/FooServiceSchema.xsd b/103120/examples/unmapped/FooServiceSchema.xsd
similarity index 100%
rename from 103120/examples/FooServiceSchema.xsd
rename to 103120/examples/unmapped/FooServiceSchema.xsd
diff --git a/103120/examples/example.key b/103120/examples/unmapped/example.key
similarity index 100%
rename from 103120/examples/example.key
rename to 103120/examples/unmapped/example.key
diff --git a/103120/examples/example.pem b/103120/examples/unmapped/example.pem
similarity index 100%
rename from 103120/examples/example.pem
rename to 103120/examples/unmapped/example.pem
diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/unmapped/mutliple-auth-example-request.xml
similarity index 100%
rename from 103120/examples/mutliple-auth-example-request.xml
rename to 103120/examples/unmapped/mutliple-auth-example-request.xml
diff --git a/103120/examples/request1.xml b/103120/examples/unmapped/request1.xml
similarity index 100%
rename from 103120/examples/request1.xml
rename to 103120/examples/unmapped/request1.xml
diff --git a/103120/examples/request2.xml b/103120/examples/unmapped/request2.xml
similarity index 100%
rename from 103120/examples/request2.xml
rename to 103120/examples/unmapped/request2.xml
diff --git a/103120/examples/request3.xml b/103120/examples/unmapped/request3.xml
similarity index 100%
rename from 103120/examples/request3.xml
rename to 103120/examples/unmapped/request3.xml
diff --git a/103120/examples/request4.xml b/103120/examples/unmapped/request4.xml
similarity index 100%
rename from 103120/examples/request4.xml
rename to 103120/examples/unmapped/request4.xml
diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/unmapped/request5-Binary-Delivery.xml
similarity index 100%
rename from 103120/examples/request5-Binary-Delivery.xml
rename to 103120/examples/unmapped/request5-Binary-Delivery.xml
diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/unmapped/request5-XML-Delivery.xml
similarity index 100%
rename from 103120/examples/request5-XML-Delivery.xml
rename to 103120/examples/unmapped/request5-XML-Delivery.xml
diff --git a/103120/examples/request6.xml b/103120/examples/unmapped/request6.xml
similarity index 100%
rename from 103120/examples/request6.xml
rename to 103120/examples/unmapped/request6.xml
diff --git a/103120/examples/request6_signed.xml b/103120/examples/unmapped/request6_signed.xml
similarity index 100%
rename from 103120/examples/request6_signed.xml
rename to 103120/examples/unmapped/request6_signed.xml
diff --git a/103120/examples/response1.xml b/103120/examples/unmapped/response1.xml
similarity index 100%
rename from 103120/examples/response1.xml
rename to 103120/examples/unmapped/response1.xml
diff --git a/103120/examples/response2.xml b/103120/examples/unmapped/response2.xml
similarity index 100%
rename from 103120/examples/response2.xml
rename to 103120/examples/unmapped/response2.xml
diff --git a/103120/examples/response3.xml b/103120/examples/unmapped/response3.xml
similarity index 100%
rename from 103120/examples/response3.xml
rename to 103120/examples/unmapped/response3.xml
diff --git a/103120/examples/response4.xml b/103120/examples/unmapped/response4.xml
similarity index 100%
rename from 103120/examples/response4.xml
rename to 103120/examples/unmapped/response4.xml
diff --git a/103120/examples/response5.xml b/103120/examples/unmapped/response5.xml
similarity index 100%
rename from 103120/examples/response5.xml
rename to 103120/examples/unmapped/response5.xml
diff --git a/103120/examples/response6.xml b/103120/examples/unmapped/response6.xml
similarity index 100%
rename from 103120/examples/response6.xml
rename to 103120/examples/unmapped/response6.xml
diff --git a/103120/schema/mapped/ts_103120_CREATE_Request.xsd b/103120/schema/mapped/ts_103120_CREATE_Request.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..dfd26251678e8d4d9d944ad7a75a7142086fe261
--- /dev/null
+++ b/103120/schema/mapped/ts_103120_CREATE_Request.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns="http://uri.etsi.org/03120/common/2022/06/MappedCREATERequest"
+           targetNamespace="http://uri.etsi.org/03120/common/2022/06/MappedCREATERequest"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+
+    <xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core" />
+
+    <xs:element name="HI1Object" type="core:HI1Object"></xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/103120/schema/mapped/ts_103120_CREATE_Response.xsd b/103120/schema/mapped/ts_103120_CREATE_Response.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..aa4026891071037c5cc214c7b120995822199ea9
--- /dev/null
+++ b/103120/schema/mapped/ts_103120_CREATE_Response.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns="http://uri.etsi.org/03120/common/2022/06/MappedCREATEResponse"
+           targetNamespace="http://uri.etsi.org/03120/common/2022/06/MappedCREATEResponse"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+
+  <xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core" />
+
+  <xs:element name="HI1Object" type="core:HI1Object"></xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/103120/schema/mapped/ts_103120_DELIVER_Request.xsd b/103120/schema/mapped/ts_103120_DELIVER_Request.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..a11361195e92796c1ef108ef5bbc312a5fac6ad8
--- /dev/null
+++ b/103120/schema/mapped/ts_103120_DELIVER_Request.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns="http://uri.etsi.org/03120/common/2022/06/MappedDELIVERRequest"
+           targetNamespace="http://uri.etsi.org/03120/common/2022/06/MappedDELIVERRequest"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+
+	<xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core" />
+
+    <xs:element name="HI1Object" type="core:HI1Object"></xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/103120/schema/mapped/ts_103120_GET_Response.xsd b/103120/schema/mapped/ts_103120_GET_Response.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..b152eabb283144b2d896d0f20ce430d9d27873fd
--- /dev/null
+++ b/103120/schema/mapped/ts_103120_GET_Response.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns="http://uri.etsi.org/03120/common/2022/06/MappedGETResponse"
+           targetNamespace="http://uri.etsi.org/03120/common/2022/06/MappedGETResponse"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+
+	<xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core" />
+
+    <xs:element name="HI1Object" type="core:HI1Object"></xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/103120/schema/mapped/ts_103120_LIST_Response.xsd b/103120/schema/mapped/ts_103120_LIST_Response.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..0751c16688e1ee0be2ea206162c5b145d6d2930e
--- /dev/null
+++ b/103120/schema/mapped/ts_103120_LIST_Response.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns="http://uri.etsi.org/03120/common/2022/06/MappedLISTResponse"
+           targetNamespace="http://uri.etsi.org/03120/common/2022/06/MappedLISTResponse"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+
+	<xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core" />
+
+  <xs:element name="LISTResponse" type="core:LISTResponse"/>
+</xs:schema>
\ No newline at end of file
diff --git a/103120/schema/mapped/ts_103120_UPDATE_Request.xsd b/103120/schema/mapped/ts_103120_UPDATE_Request.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..4c4f3372baed29054cd35016d5f27f7e23074c27
--- /dev/null
+++ b/103120/schema/mapped/ts_103120_UPDATE_Request.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns="http://uri.etsi.org/03120/common/2022/06/MappedUPDATERequest"
+           targetNamespace="http://uri.etsi.org/03120/common/2022/06/MappedUPDATERequest"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+
+	<xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core" />
+
+    <xs:element name="HI1Object" type="core:HI1Object"></xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/103120/schema/mapped/ts_103120_UPDATE_Response.xsd b/103120/schema/mapped/ts_103120_UPDATE_Response.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..3f8b708d4daced22e33b3363611a7484847abdf8
--- /dev/null
+++ b/103120/schema/mapped/ts_103120_UPDATE_Response.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
+           xmlns="http://uri.etsi.org/03120/common/2022/06/MappedUPDATEResponse"
+           targetNamespace="http://uri.etsi.org/03120/common/2022/06/MappedUPDATEResponse"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+
+	<xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core" />
+
+    <xs:element name="HI1Object" type="core:HI1Object"></xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json
index 69ad1b50881635e0b2aa86dd159dc1110217da5e..3e37827eee235aa1302da707fae3677272375d92 100644
--- a/testing/xsd_compile_targets.json
+++ b/testing/xsd_compile_targets.json
@@ -40,10 +40,10 @@
             "103120/schema/ts_103120_Task.xsd",
             "103280/TS_103_280.xsd",
             "testing/deps/xmldsig/xmldsig-core-schema.xsd",
-            "103120/examples/FooServiceSchema.xsd"
+            "103120/examples/unmapped/FooServiceSchema.xsd"
         ],
         "exampleFiles" : [
-            "103120/examples"
+            "103120/examples/unmapped"
         ]
     }
 ]
\ No newline at end of file