diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8ec525b31714b12acb055b8a3f4f2012d6b0de0..4c0fc3081cc8cb383e9fc7c21aa5d73a7adae609 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ generate_artefacts:
     - echo $CI_MERGE_REQUEST_IID
     - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
     - echo $ARTEFACT_NAME
-    - forgelib-changedocs -v -d -c -l --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID
+    - forgelib-changedocs -x asn -x asn1 -x xsd -x xml -x json -v -d -c -l --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_MERGE_REQUEST_IID
   artifacts:
     untracked: true
     paths:
diff --git a/103120/examples/json/request5-JSON-Delivery.json b/103120/examples/json/request5-JSON-Delivery.json
new file mode 100644
index 0000000000000000000000000000000000000000..860839352375af17a442cde7d5e281054a7bd459
--- /dev/null
+++ b/103120/examples/json/request5-JSON-Delivery.json
@@ -0,0 +1,65 @@
+{
+  "@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",
+  "Header": {
+    "SenderIdentifier": {
+      "CountryCode": "XX",
+      "UniqueIdentifier": "ACTOR2"
+    },
+    "ReceiverIdentifier": {
+      "CountryCode": "XX",
+      "UniqueIdentifier": "ACTOR1"
+    },
+    "TransactionIdentifier": "64cd73e1-a438-4d47-9cfb-cead9125a502",
+    "Timestamp": "2019-09-30T13:37:37.000000Z",
+    "Version": {
+      "ETSIVersion": "V1.14.1",
+      "NationalProfileOwner": "XX",
+      "NationalProfileVersion": "v1.0"
+    }
+  },
+  "Payload": {
+    "RequestPayload": {
+      "ActionRequests": {
+        "ActionRequest": [
+          {
+            "ActionIdentifier": 0,
+            "DELIVER": {
+              "Identifier": "11f49f11-39df-4596-aa58-1f7199b587df",
+              "HI1Object": {
+                "@xsi:type": "{http://uri.etsi.org/03120/common/2019/10/Delivery}DeliveryObject",
+                "ObjectIdentifier": "11f49f11-39df-4596-aa58-1f7199b587df",
+                "AssociatedObjects": {
+                  "AssociatedObject": [
+                    "2b36a78b-b628-416d-bd22-404e68a0cd36"
+                  ]
+                },
+                "delivery:Reference": {
+                  "delivery:LDID": "XX-ACTOR01-1234"
+                },
+                "delivery:SequenceNumber": 1,
+                "delivery:LastSequence": true,
+                "delivery:Manifest": {
+                  "delivery:Specification": {
+                    "common:Owner": "ETSI",
+                    "common:Name": "ManifestSpecification",
+                    "common:Value": "TS102657-XML"
+                  }
+                },
+                "delivery:Delivery": {
+                  "delivery:EmbeddedJSONData": {
+                    "field1" : "this is native JSON embedded data",
+                    "field2" : 1234
+                  }
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/103120/schema/json/TS_103_280.schema.json b/103120/schema/json/TS_103_280.schema.json
deleted file mode 100644
index 02cd078e139e4896bad9cd8efcb2cfc7ae1a070a..0000000000000000000000000000000000000000
--- a/103120/schema/json/TS_103_280.schema.json
+++ /dev/null
@@ -1,389 +0,0 @@
-{
-  "$id": "ts_103280_2017_07",
-  "$defs": {
-    "ShortString": {
-      "type": "string",
-      "maxLength": 255
-    },
-    "LongString": {
-      "type": "string",
-      "maxLength": 65535
-    },
-    "LIID": {
-      "type": "string",
-      "pattern": "^([!-~]{1,25})|([0-9a-f]{26,50})$"
-    },
-    "UTCDateTime": {
-      "type": "string",
-      "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$"
-    },
-    "UTCMicrosecondDateTime": {
-      "type": "string",
-      "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}Z$"
-    },
-    "QualifiedDateTime": {
-      "type": "string",
-      "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(Z|[+-][0-9]{2}:[0-9]{2})$"
-    },
-    "QualifiedMicrosecondDateTime": {
-      "type": "string",
-      "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}(Z|[+-][0-9]{2}:[0-9]{2})$"
-    },
-    "InternationalE164": {
-      "type": "string",
-      "pattern": "^[0-9]{1,15}$"
-    },
-    "IMSI": {
-      "type": "string",
-      "pattern": "^[0-9]{6,15}$"
-    },
-    "IMEI": {
-      "type": "string",
-      "pattern": "^[0-9]{14}$"
-    },
-    "IMEICheckDigit": {
-      "type": "string",
-      "pattern": "^[0-9]{15}$"
-    },
-    "IMEISV": {
-      "type": "string",
-      "pattern": "^[0-9]{16}$"
-    },
-    "IPv4Address": {
-      "type": "string",
-      "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$"
-    },
-    "IPv4CIDR": {
-      "type": "string",
-      "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/([1-2]?[0-9]|3[0-2])$"
-    },
-    "IPv6Address": {
-      "type": "string",
-      "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})$"
-    },
-    "IPv6CIDR": {
-      "type": "string",
-      "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))$"
-    },
-    "TCPPort": {
-      "type": "integer",
-      "exclusiveMinimum": 1,
-      "maximum": 65535
-    },
-    "UDPPort": {
-      "type": "integer",
-      "minimum": 0,
-      "maximum": 65535
-    },
-    "MACAddress": {
-      "type": "string",
-      "pattern": "^([a-f0-9]{2}:){5}[a-f0-9]{2}$"
-    },
-    "EmailAddress": {
-      "allOf": [
-        {
-          "$ref": "#/$defs/ShortString"
-        },
-        {
-          "type": "string",
-          "pattern": "^[a-zA-Z0-9\\.!#$%&'\\*\\+\\\\/=\\?\\^_`\\{\\|\\}~\\-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"
-        }
-      ]
-    },
-    "UUID": {
-      "type": "string",
-      "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
-    },
-    "ISOCountryCode": {
-      "type": "string",
-      "pattern": "^[A-Z]{2}$"
-    },
-    "SIPURI": {
-      "type": "string",
-      "pattern": "^sips?:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$"
-    },
-    "TELURI": {
-      "type": "string",
-      "pattern": "^tel:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$"
-    },
-    "WGS84LatitudeDecimal": {
-      "type": "string",
-      "pattern": "^[NS][0-9]{2}\\.[0-9]{6}$"
-    },
-    "WGS84LongitudeDecimal": {
-      "type": "string",
-      "pattern": "^[EW][0-9]{3}\\.[0-9]{6}$"
-    },
-    "WGS84LatitudeAngular": {
-      "type": "string",
-      "pattern": "^[NS][0-9]{6}\\.[0-9]{2}$"
-    },
-    "WGS84LongitudeAngular": {
-      "type": "string",
-      "pattern": "^[EW][0-9]{7}\\.[0-9]{2}$"
-    },
-    "SUPIIMSI": {
-      "$ref": "#/$defs/IMSI"
-    },
-    "SUPINAI": {
-      "$ref": "#/$defs/NAI"
-    },
-    "SUCI": {
-      "type": "string",
-      "pattern": "^([a-fA-F0-9]{2})*$"
-    },
-    "PEIIMEI": {
-      "$ref": "#/$defs/IMEI"
-    },
-    "PEIIMEICheckDigit": {
-      "$ref": "#/$defs/IMEICheckDigit"
-    },
-    "PEIIMEISV": {
-      "$ref": "#/$defs/IMEISV"
-    },
-    "GPSIMSISDN": {
-      "type": "string",
-      "pattern": "^[0-9]{1,15}$"
-    },
-    "GPSINAI": {
-      "$ref": "#/$defs/NAI"
-    },
-    "NAI": {
-      "type": "string"
-    },
-    "LDID": {
-      "type": "string",
-      "pattern": "^([A-Z]{2}-.+-.+)$"
-    },
-    "InternationalizedEmailAddress": {
-      "allOf": [
-        {
-          "$ref": "#/$defs/ShortString"
-        },
-        {
-          "type": "string",
-          "pattern": "^.+@.+$"
-        }
-      ]
-    },
-    "EUI64": {
-      "type": "string",
-      "pattern": "^([a-f0-9]{2}:){7}[a-f0-9]{2}$"
-    },
-    "CGI": {
-      "type": "string",
-      "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}$"
-    },
-    "ECGI": {
-      "type": "string",
-      "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}$"
-    },
-    "NCGI": {
-      "type": "string",
-      "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}$"
-    },
-    "ICCID": {
-      "type": "string",
-      "pattern": "^[0-9]{19,20}$"
-    },
-    "IPProtocol": {
-      "type": "integer",
-      "minimum": 0,
-      "maximum": 255
-    },
-    "IPAddress": {
-      "oneOf": [
-        {
-          "type": "object",
-          "properties": {
-            "etsi280:IPv4Address": {
-              "$ref": "#/$defs/IPv4Address"
-            }
-          },
-          "required": [
-            "etsi280:IPv4Address"
-          ]
-        },
-        {
-          "type": "object",
-          "properties": {
-            "etsi280:IPv6Address": {
-              "$ref": "#/$defs/IPv6Address"
-            }
-          },
-          "required": [
-            "etsi280:IPv6Address"
-          ]
-        }
-      ]
-    },
-    "IPCIDR": {
-      "oneOf": [
-        {
-          "type": "object",
-          "properties": {
-            "etsi280:IPv4CIDR": {
-              "$ref": "#/$defs/IPv4CIDR"
-            }
-          },
-          "required": [
-            "etsi280:IPv4CIDR"
-          ]
-        },
-        {
-          "type": "object",
-          "properties": {
-            "etsi280:IPv6CIDR": {
-              "$ref": "#/$defs/IPv6CIDR"
-            }
-          },
-          "required": [
-            "etsi280:IPv6CIDR"
-          ]
-        }
-      ]
-    },
-    "TCPPortRange": {
-      "type": "object",
-      "properties": {
-        "etsi280:start": {
-          "$ref": "#/$defs/TCPPort"
-        },
-        "etsi280:end": {
-          "$ref": "#/$defs/TCPPort"
-        }
-      },
-      "required": [
-        "etsi280:start",
-        "etsi280:end"
-      ]
-    },
-    "UDPPortRange": {
-      "type": "object",
-      "properties": {
-        "etsi280:start": {
-          "$ref": "#/$defs/UDPPort"
-        },
-        "etsi280:end": {
-          "$ref": "#/$defs/UDPPort"
-        }
-      },
-      "required": [
-        "etsi280:start",
-        "etsi280:end"
-      ]
-    },
-    "Port": {
-      "oneOf": [
-        {
-          "type": "object",
-          "properties": {
-            "etsi280:TCPPort": {
-              "$ref": "#/$defs/TCPPort"
-            }
-          },
-          "required": [
-            "etsi280:TCPPort"
-          ]
-        },
-        {
-          "type": "object",
-          "properties": {
-            "etsi280:UDPPort": {
-              "$ref": "#/$defs/UDPPort"
-            }
-          },
-          "required": [
-            "etsi280:UDPPort"
-          ]
-        }
-      ]
-    },
-    "PortRange": {
-      "oneOf": [
-        {
-          "type": "object",
-          "properties": {
-            "etsi280:TCPPortRange": {
-              "$ref": "#/$defs/TCPPortRange"
-            }
-          },
-          "required": [
-            "etsi280:TCPPortRange"
-          ]
-        },
-        {
-          "type": "object",
-          "properties": {
-            "etsi280:UDPPortRange": {
-              "$ref": "#/$defs/UDPPortRange"
-            }
-          },
-          "required": [
-            "etsi280:UDPPortRange"
-          ]
-        }
-      ]
-    },
-    "IPAddressPort": {
-      "type": "object",
-      "properties": {
-        "etsi280:address": {
-          "$ref": "#/$defs/IPAddress"
-        },
-        "etsi280:port": {
-          "$ref": "#/$defs/Port"
-        }
-      },
-      "required": [
-        "etsi280:address",
-        "etsi280:port"
-      ]
-    },
-    "IPAddressPortRange": {
-      "type": "object",
-      "properties": {
-        "etsi280:address": {
-          "$ref": "#/$defs/IPAddress"
-        },
-        "etsi280:portRange": {
-          "$ref": "#/$defs/PortRange"
-        }
-      },
-      "required": [
-        "etsi280:address",
-        "etsi280:portRange"
-      ]
-    },
-    "WGS84CoordinateDecimal": {
-      "type": "object",
-      "properties": {
-        "etsi280:latitude": {
-          "$ref": "#/$defs/WGS84LatitudeDecimal"
-        },
-        "etsi280:longitude": {
-          "$ref": "#/$defs/WGS84LongitudeDecimal"
-        }
-      },
-      "required": [
-        "etsi280:latitude",
-        "etsi280:longitude"
-      ]
-    },
-    "WGS84CoordinateAngular": {
-      "type": "object",
-      "properties": {
-        "etsi280:latitude": {
-          "$ref": "#/$defs/WGS84LatitudeAngular"
-        },
-        "etsi280:longitude": {
-          "$ref": "#/$defs/WGS84LongitudeAngular"
-        }
-      },
-      "required": [
-        "etsi280:latitude",
-        "etsi280:longitude"
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/103120/schema/json/ts_103120_Delivery.schema.json b/103120/schema/json/ts_103120_Delivery.schema.json
index 093d1276aa3ad3480d106df81f4f60f764ae294b..bca43104eee1351823e13f5893d28a63a54676f1 100644
--- a/103120/schema/json/ts_103120_Delivery.schema.json
+++ b/103120/schema/json/ts_103120_Delivery.schema.json
@@ -180,6 +180,15 @@
           "required": [
             "delivery:XMLData"
           ]
+        },
+        {
+          "type": "object",
+          "properties": {
+            "delivery:XMLData": { }
+          },
+          "required": [
+            "delivery:EmbeddedJSONData"
+          ]
         }
       ]
     },
@@ -206,4 +215,4 @@
     },
     "EmbeddedXMLData": {}
   }
-}
\ No newline at end of file
+}