diff --git a/104112/examples/xml/MessagingServiceSchema.xsd b/104112/examples/xml/MessagingServiceSchema.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..4089b7fbc11990b9a7a2530af96b9a49979c8e24
--- /dev/null
+++ b/104112/examples/xml/MessagingServiceSchema.xsd
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns="http://MessagingServiceSchema.example.com/schema/v1.1.1/" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://MessagingServiceSchema.example.com/schema/v1.1.1/" elementFormDefault="qualified">
+    <xs:element name="messagingServiceDefinedParameters" type="MessagingServiceDefinedParameters"/>
+    <xs:complexType name="MessagingServiceDefinedParameters">
+        <xs:sequence>
+            <xs:element name="messageID" type="xs:string"/>
+            <xs:element name="messageContent" type="xs:string"/>
+            <xs:element name="attachment" type="MessageAttachment" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="MessageAttachment">
+        <xs:sequence>
+            <xs:element name="attachmentType" type="xs:string"/>
+            <xs:element name="attachmentData" type="xs:base64Binary"/>
+        </xs:sequence>
+    </xs:complexType>
+</xs:schema>
diff --git a/104112/examples/xml/TC-03_LIDelivery_TSC001.xml b/104112/examples/xml/TC-03_LIDelivery_TSC001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..22907810a53f1312c70dfaf6d59d572d625d0750
--- /dev/null
+++ b/104112/examples/xml/TC-03_LIDelivery_TSC001.xml
@@ -0,0 +1,101 @@
+<?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" xmlns:msg="http://uri.etsi.org/03707/2020/02">
+    <Header>
+        <SenderIdentifier>
+            <CountryCode>XX</CountryCode>
+            <UniqueIdentifier>ACTOR02</UniqueIdentifier>
+        </SenderIdentifier>
+        <ReceiverIdentifier>
+            <CountryCode>XX</CountryCode>
+            <UniqueIdentifier>ACTOR01</UniqueIdentifier>
+        </ReceiverIdentifier>
+        <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
+        <Timestamp>2025-04-04T13:37:37.000000Z</Timestamp>
+        <Version>
+            <ETSIVersion>V1.18.1</ETSIVersion>
+            <NationalProfileOwner>XX</NationalProfileOwner>
+            <NationalProfileVersion>v1.0</NationalProfileVersion>
+        </Version>
+    </Header>
+    <Payload>
+        <RequestPayload>
+            <ActionRequests>
+                <ActionRequest>
+                    <ActionIdentifier>0</ActionIdentifier>
+                    <DELIVER>
+                        <Identifier>71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e</Identifier>
+                        <HI1Object xsi:type="delivery:DeliveryObject">
+                            <ObjectIdentifier>71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e</ObjectIdentifier>
+                            <AssociatedObjects>
+                                <AssociatedObject>2b36a78b-b628-416d-bd22-404e68a0cd36</AssociatedObject>
+                            </AssociatedObjects>
+                            <delivery:Reference>
+                                <delivery:LDID>XX-ACTOR01-1234</delivery:LDID>
+                            </delivery:Reference>
+                            <delivery:DeliveryID>d1079830-8e9a-4731-8fb7-36b9b961eb73</delivery:DeliveryID>
+                            <delivery:SequenceNumber>1</delivery:SequenceNumber>
+                            <delivery:LastSequence>true</delivery:LastSequence>
+                            <delivery:Manifest>
+                                <delivery:Specification>
+                                    <common:Owner>ETSI</common:Owner>
+                                    <common:Name>ManifestSpecification</common:Name>
+                                    <common:Value>TS103707</common:Value>
+                                </delivery:Specification>
+                            </delivery:Manifest>
+                            <delivery:Delivery>
+                                <delivery:XMLData>
+                                    <msg:handoverItem>
+                                        <msg:header/>
+                                        <msg:payload xsi:type="msg:MessagingPayload">
+                                            <msg:coreParameters>
+                                                <msg:messageSender>
+                                                    <msg:identifiers>
+                                                        <msg:qualifiedIdentifier>
+                                                            <msg:formatType>
+                                                                <task:FormatOwner>ETSI</task:FormatOwner>
+                                                                <task:FormatName>EmailAddress</task:FormatName>
+                                                            </msg:formatType>
+                                                            <msg:value>PartyA@example.com</msg:value>
+                                                        </msg:qualifiedIdentifier>
+                                                    </msg:identifiers>
+                                                    <msg:isTargetedParty>true</msg:isTargetedParty>
+                                                </msg:messageSender>
+                                                <msg:messageReceivers>
+                                                    <msg:recipient>
+                                                        <msg:identifiers>
+                                                            <msg:qualifiedIdentifier>
+                                                                <msg:formatType>
+                                                                    <task:FormatOwner>ETSI</task:FormatOwner>
+                                                                    <task:FormatName>EmailAddress</task:FormatName>
+                                                                </msg:formatType>
+                                                                <msg:value>PartyA@example.com</msg:value>
+                                                            </msg:qualifiedIdentifier>
+                                                        </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>
+                    </DELIVER>
+                </ActionRequest>
+            </ActionRequests>
+        </RequestPayload>
+    </Payload>
+</HI1Message>
diff --git a/104112/examples/xml/TC-03_LIDelivery_TSC007.xml b/104112/examples/xml/TC-03_LIDelivery_TSC007.xml
new file mode 100644
index 0000000000000000000000000000000000000000..68ca2ca9af637dd736066f360259475ce0ac1013
--- /dev/null
+++ b/104112/examples/xml/TC-03_LIDelivery_TSC007.xml
@@ -0,0 +1,112 @@
+<?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" xmlns:msg="http://uri.etsi.org/03707/2020/02">
+    <Header>
+        <SenderIdentifier>
+            <CountryCode>XX</CountryCode>
+            <UniqueIdentifier>ACTOR02</UniqueIdentifier>
+        </SenderIdentifier>
+        <ReceiverIdentifier>
+            <CountryCode>XX</CountryCode>
+            <UniqueIdentifier>ACTOR01</UniqueIdentifier>
+        </ReceiverIdentifier>
+        <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
+        <Timestamp>2025-04-04T13:37:37.000000Z</Timestamp>
+        <Version>
+            <ETSIVersion>V1.18.1</ETSIVersion>
+            <NationalProfileOwner>XX</NationalProfileOwner>
+            <NationalProfileVersion>v1.0</NationalProfileVersion>
+        </Version>
+    </Header>
+    <Payload>
+        <RequestPayload>
+            <ActionRequests>
+                <ActionRequest>
+                    <ActionIdentifier>0</ActionIdentifier>
+                    <DELIVER>
+                        <Identifier>71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e</Identifier>
+                        <HI1Object xsi:type="delivery:DeliveryObject">
+                            <ObjectIdentifier>71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e</ObjectIdentifier>
+                            <AssociatedObjects>
+                                <AssociatedObject>2b36a78b-b628-416d-bd22-404e68a0cd36</AssociatedObject>
+                            </AssociatedObjects>
+                            <delivery:Reference>
+                                <delivery:LDID>XX-ACTOR01-1234</delivery:LDID>
+                            </delivery:Reference>
+                            <delivery:DeliveryID>d1079830-8e9a-4731-8fb7-36b9b961eb73</delivery:DeliveryID>
+                            <delivery:SequenceNumber>1</delivery:SequenceNumber>
+                            <delivery:LastSequence>true</delivery:LastSequence>
+                            <delivery:Manifest>
+                                <delivery:Specification>
+                                    <common:Owner>ETSI</common:Owner>
+                                    <common:Name>ManifestSpecification</common:Name>
+                                    <common:Value>TS103707</common:Value>
+                                </delivery:Specification>
+                            </delivery:Manifest>
+                            <delivery:Delivery>
+                                <delivery:XMLData>
+                                    <msg:handoverItem>
+                                        <msg:header/>
+                                        <msg:payload xsi:type="msg:MessagingPayload">
+                                            <msg:coreParameters>
+                                                <msg:messageSender>
+                                                    <msg:identifiers>
+                                                        <msg:qualifiedIdentifier>
+                                                            <msg:formatType>
+                                                                <task:FormatOwner>ETSI</task:FormatOwner>
+                                                                <task:FormatName>EmailAddress</task:FormatName>
+                                                            </msg:formatType>
+                                                            <msg:value>PartyA@example.com</msg:value>
+                                                        </msg:qualifiedIdentifier>
+                                                    </msg:identifiers>
+                                                    <msg:isTargetedParty>true</msg:isTargetedParty>
+                                                </msg:messageSender>
+                                                <msg:messageReceivers>
+                                                    <msg:recipient>
+                                                        <msg:identifiers>
+                                                            <msg:qualifiedIdentifier>
+                                                                <msg:formatType>
+                                                                    <task:FormatOwner>ETSI</task:FormatOwner>
+                                                                    <task:FormatName>EmailAddress</task:FormatName>
+                                                                </msg:formatType>
+                                                                <msg:value>PartyB@example.com</msg:value>
+                                                            </msg:qualifiedIdentifier>
+                                                        </msg:identifiers>
+                                                    </msg:recipient>
+                                                    <msg:recipient>
+                                                        <msg:identifiers>
+                                                            <msg:qualifiedIdentifier>
+                                                                <msg:formatType>
+                                                                    <task:FormatOwner>ETSI</task:FormatOwner>
+                                                                    <task:FormatName>EmailAddress</task:FormatName>
+                                                                </msg:formatType>
+                                                                <msg:value>PartyC@example.com</msg:value>
+                                                            </msg:qualifiedIdentifier>
+                                                        </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>
+                    </DELIVER>
+                </ActionRequest>
+            </ActionRequests>
+        </RequestPayload>
+    </Payload>
+</HI1Message>
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"
         ]
-    }      
+    }
 ]