diff --git a/104112/examples/xml/TC-03_LIDelivery_TSC001.xml b/104112/examples/xml/TC-03_LIDelivery_TSC001.xml
index c315876003e85c5442156877f4447a5c721f3f7f..909bdfa73a51bf46b732c3f3088dc4b082692186 100644
--- a/104112/examples/xml/TC-03_LIDelivery_TSC001.xml
+++ b/104112/examples/xml/TC-03_LIDelivery_TSC001.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common">
+<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:msg="http://uri.etsi.org/03707/2020/02">
     <Header>
         <SenderIdentifier>
             <CountryCode>XX</CountryCode>
@@ -44,40 +44,40 @@
                             </delivery:Manifest>
                             <delivery:Delivery>
                                 <delivery:XMLData>
-                                    <handoverItem xmlns="http://uri.etsi.org/03707/2020/02" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-                                        <header/>
-                                        <payload xsi:type="MessagingPayload">
-                                            <coreParameters>
-                                                <messageSender>
-                                                    <identifiers>
-                                                        <identifier>PartyA@example.com</identifier>
-                                                    </identifiers>
-                                                    <isTargetedParty>true</isTargetedParty>
-                                                </messageSender>
-                                                <messageReceivers>
-                                                    <recipient>
-                                                        <identifiers>
-                                                            <identifier>PartyB@example.com</identifier>
-                                                        </identifiers>
-                                                    </recipient>
-                                                </messageReceivers>
-                                                <timestamp>2025-04-04T13:37:37.000000+00:00</timestamp>
-                                            </coreParameters>
-                                            <cspDefinedParameters>
-                                                <cspDefinedMetadata>
-                                                    <schemaDetails>
-                                                        <schemaIdentifier>http://MessagingServiceSchema.example.com/schema/v1.1.1/</schemaIdentifier>
-                                                    </schemaDetails>
-                                                    <xmlData>
-                                                        <messagingServiceDefinedParameters xmlns="http://MessagingServiceSchema.example.com/schema/v1.1.1/">
-                                                            <messageID>633523913219</messageID>
-                                                            <message>Foo for you</message>
-                                                        </messagingServiceDefinedParameters>
-                                                    </xmlData>
-                                                </cspDefinedMetadata>
-                                            </cspDefinedParameters>
-                                        </payload>
-                                    </handoverItem>
+                                    <msg:handoverItem>
+                                        <msg:header/>
+                                        <msg:payload xsi:type="msg:MessagingPayload">
+                                            <msg:coreParameters>
+                                                <msg:messageSender>
+                                                    <msg:identifiers>
+                                                        <msg:identifier>PartyA@example.com</msg:identifier>
+                                                    </msg:identifiers>
+                                                    <msg:isTargetedParty>true</msg:isTargetedParty>
+                                                </msg:messageSender>
+                                                <msg:messageReceivers>
+                                                    <msg:recipient>
+                                                        <msg:identifiers>
+                                                            <msg:identifier>PartyB@example.com</msg:identifier>
+                                                        </msg:identifiers>
+                                                    </msg:recipient>
+                                                </msg:messageReceivers>
+                                                <msg:timestamp>2025-04-04T13:37:37.000000+00:00</msg:timestamp>
+                                            </msg:coreParameters>
+                                            <msg:cspDefinedParameters>
+                                                <msg:cspDefinedMetadata>
+                                                    <msg:schemaDetails>
+                                                        <msg:schemaIdentifier>http://MessagingServiceSchema.example.com/schema/v1.1.1/</msg:schemaIdentifier>
+                                                    </msg:schemaDetails>
+                                                    <msg:xmlData>
+                                                        <example:messagingServiceDefinedParameters xmlns:example="http://MessagingServiceSchema.example.com/schema/v1.1.1/">
+                                                            <example:messageID>633523913219</example:messageID>
+                                                            <example:messageContent>Foo for you</example:messageContent>
+                                                        </example:messagingServiceDefinedParameters>
+                                                    </msg:xmlData>
+                                                </msg:cspDefinedMetadata>
+                                            </msg:cspDefinedParameters>
+                                        </msg:payload>
+                                    </msg:handoverItem>
                                 </delivery:XMLData>
                             </delivery:Delivery>
                         </HI1Object>
diff --git a/104112/examples/xml/TC-03_LIDelivery_TSC007.xml b/104112/examples/xml/TC-03_LIDelivery_TSC007.xml
index 46846ef7dbd692da7ae649509789289d23204a9a..e84cb900abafe3132e5f7924dc57776773aaeeba 100644
--- a/104112/examples/xml/TC-03_LIDelivery_TSC007.xml
+++ b/104112/examples/xml/TC-03_LIDelivery_TSC007.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common">
+<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:msg="http://uri.etsi.org/03707/2020/02">
     <Header>
         <SenderIdentifier>
             <CountryCode>XX</CountryCode>
@@ -44,41 +44,41 @@
                             </delivery:Manifest>
                             <delivery:Delivery>
                                 <delivery:XMLData>
-                                    <handoverItem xmlns="http://uri.etsi.org/03707/2020/02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-                                        <header/>
-                                        <payload xsi:type="MessagingPayload">
-                                            <coreParameters>
-                                                <messageSender>
-                                                    <identifiers>
-                                                        <identifier>PartyA@example.com</identifier>
-                                                    </identifiers>
-                                                    <isTargetedParty>true</isTargetedParty>
-                                                </messageSender>
-                                                <messageReceivers>
-                                                    <recipient>
-                                                        <identifiers>
-                                                            <identifier>PartyB@example.com</identifier>
-                                                            <identifier>PartyC@example.com</identifier>
-                                                        </identifiers>
-                                                    </recipient>
-                                                </messageReceivers>
-                                                <timestamp>2025-04-04T13:37:37.000000+00:00</timestamp>
-                                            </coreParameters>
-                                            <cspDefinedParameters>
-                                                <cspDefinedMetadata>
-                                                    <schemaDetails>
-                                                        <schemaIdentifier>http://MessagingServiceSchema.example.com/schema/v1.1.1/</schemaIdentifier>
-                                                    </schemaDetails>
-                                                    <xmlData>
-                                                        <messagingServiceDefinedParameters xmlns="http://MessagingServiceSchema.example.com/schema/v1.1.1/">
-                                                            <messageID>633523913219</messageID>
-                                                            <message>Foo for the group</message>
-                                                        </messagingServiceDefinedParameters>
-                                                    </xmlData>
-                                                </cspDefinedMetadata>
-                                            </cspDefinedParameters>
-                                        </payload>
-                                    </handoverItem>
+                                    <msg:handoverItem>
+                                        <msg:header/>
+                                        <msg:payload xsi:type="msg:MessagingPayload">
+                                            <msg:coreParameters>
+                                                <msg:messageSender>
+                                                    <msg:identifiers>
+                                                        <msg:identifier>PartyA@example.com</msg:identifier>
+                                                    </msg:identifiers>
+                                                    <msg:isTargetedParty>true</msg:isTargetedParty>
+                                                </msg:messageSender>
+                                                <msg:messageReceivers>
+                                                    <msg:recipient>
+                                                        <msg:identifiers>
+                                                            <msg:identifier>PartyB@example.com</msg:identifier>
+                                                            <msg:identifier>PartyC@example.com</msg:identifier>
+                                                        </msg:identifiers>
+                                                    </msg:recipient>
+                                                </msg:messageReceivers>
+                                                <msg:timestamp>2025-04-04T13:37:37.000000+00:00</msg:timestamp>
+                                            </msg:coreParameters>
+                                            <msg:cspDefinedParameters>
+                                                <msg:cspDefinedMetadata>
+                                                    <msg:schemaDetails>
+                                                        <msg:schemaIdentifier>http://MessagingServiceSchema.example.com/schema/v1.1.1/</msg:schemaIdentifier>
+                                                    </msg:schemaDetails>
+                                                    <msg:xmlData>
+                                                        <example:messagingServiceDefinedParameters xmlns:example="http://MessagingServiceSchema.example.com/schema/v1.1.1/">
+                                                            <example:messageID>633523913219</example:messageID>
+                                                            <example:messageContent>Foo for the group</example:messageContent>
+                                                        </example:messagingServiceDefinedParameters>
+                                                    </msg:xmlData>
+                                                </msg:cspDefinedMetadata>
+                                            </msg:cspDefinedParameters>
+                                        </msg:payload>
+                                    </msg:handoverItem>
                                 </delivery:XMLData>
                             </delivery:Delivery>
                         </HI1Object>
diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json
index ee06c63e650bb14196ba4abaf97a599133d6f5a9..19d37c8185fc72a79cf526828e7481ece799e42f 100644
--- a/testing/xsd_compile_targets.json
+++ b/testing/xsd_compile_targets.json
@@ -72,13 +72,16 @@
             "103120/schema/xsd/ts_103120_Common.xsd",
             "103120/schema/xsd/ts_103120_Core.xsd",
             "103120/schema/xsd/ts_103120_Config.xsd",
+            "103120/schema/xsd/ts_103120_Delivery.xsd",
             "103120/dictionaries/ts_103120_Dictionaries.xsd",
             "103120/schema/xsd/ts_103120_Task.xsd",
             "testing/deps/xmldsig/xmldsig-core-schema.xsd",
-            "103707/examples/FooServiceSchema.xsd"
+            "103707/examples/FooServiceSchema.xsd",
+            "104112/examples/xml/MessagingServiceSchema.xsd"
         ],
         "exampleFiles" : [
-            "103707/examples"
+            "103707/examples",
+            "104112/examples"
         ]
     },
     {
@@ -89,5 +92,5 @@
         "exampleFiles" : [
             "104000/examples"
         ]
-    }      
+    }
 ]