diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4e3df33f5089456fc4d64b9dcd03d40ab38864c..73272b9a4e6063d18278d81e44d03ce42da76079 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,57 @@
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
+      when: never
+    - if: $CI_COMMIT_BRANCH
+
 stages:
+  - preflight
   - check
+  - build
+
+preflight:
+  image: "forge.etsi.org:5050/li/schemas-definitions/forgelib"
+  stage: preflight
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+  interruptible: true
+  script:
+    - forgelib-preflight https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_MERGE_REQUEST_IID
 
 process_asn:
-  image: "mcanterb/asn1test:latest"
+  image: "forge.etsi.org:5050/li/schemas-definitions/asn1test:latest"
   stage: check
   interruptible: true
   script:
     - python3 testing/asn_process.py
 
 process_xsd:
-  image: "mcanterb/xsdtest:latest"
+  image: "forge.etsi.org:5050/li/schemas-definitions/xsdtest:latest"
   stage: check
   interruptible: true
   script:
     - python3 testing/xsd_process.py
 
+generate_artefacts:
+  image: "forge.etsi.org:5050/li/schemas-definitions/forgelib"
+  stage: build
+  interruptible: true
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+  script:
+    - echo $CI_PROJECT_ID
+    - echo $CI_PROJECT_NAME
+    - echo $CI_PROJECT_PATH
+    - echo $CI_PIPELINE_SOURCE
+    - echo $CI_OPEN_MERGE_REQUESTS
+    - echo $CI_MERGE_REQUEST_IID
+    - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+    - echo $ARTEFACT_NAME
+    - forgelib-changedocs -v https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID
+  artifacts:
+    untracked: true
+    paths:
+      - "*.docx"
+    name: $CI_MERGE_REQUEST_TITLE
+    expire_in: 30 days
diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index f3d98ebaea2cc85514b8e80bbd2693710513d61a..963c7cdf0199853866d06d023f3b99d41e5d1a98 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -1,4 +1,4 @@
-RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version26(26)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version27(27)}
 
 DEFINITIONS IMPLICIT TAGS ::=
 
@@ -12,7 +12,7 @@ BEGIN
 retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)}
 
 -- rdHeader
-rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version26(26)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version27(27)}
 
 -- ======================================
 -- Top level definitions for RDHI wrapper
@@ -2269,6 +2269,176 @@ NetworkAccessRecord::= CHOICE
 	...
 }
 
+
+EdgeComputingRecord ::= CHOICE
+{
+	edgeComputingSubscriber		                [1] EdgeComputingSubscriber,
+	edgeComputingApplicationBillingDetails	    [2] EdgeComputingApplicationBillingDetails,
+	edgeComputingApplicationUsage	            [3] EdgeComputingApplicationUsage,
+	edgeComputingDevice			                [4] EdgeComputingDevice
+}
+
+-- ==============================
+-- Definitions of Edge Computing Subscriber Data
+-- ==============================
+
+EdgeComputingSubscriber ::= SEQUENCE
+{
+	subscriberID						   [1] EdgeComputingSubscriberID OPTIONAL,
+		-- unique identifier for this subscriber, i.e., EECID
+	genericSubscriberInfo                  [2] GenericSubscriberInfo OPTIONAL,
+		-- generic personal information about this subscriber
+	edgeComputingSubscriberInfo            [3] UTF8String OPTIONAL,
+    subscribedEdgeComputingApplications    [4] SEQUENCE OF SubscribedEdgeComputingApplications OPTIONAL
+		-- a subscriber may have more than one edge computing applications listed against them
+}
+
+EdgeComputingSubscriberID ::= UTF8String
+	-- unique identifier for this subscriber, i.e., EECID
+
+SubscribedEdgeComputingApplications ::= SEQUENCE
+{
+	edgeComputingApplicationID    [1] UTF8String OPTIONAL,
+		-- Unique identifier for this application within the edge ASP
+	providerID                    [2] UTF8String OPTIONAL,
+		-- Unique identifier for the edge ASP
+	timespan                      [3] TimeSpan OPTIONAL,
+		-- Start and end data, if applicable, of the subscription
+	registeredIdentifiers         [4] SEQUENCE OF UTF8String OPTIONAL,
+		-- The set of identifiers registered for this application
+	edgeComputingApplicationType  [5] UTF8String OPTIONAL,
+	installationAddress           [6] AddressInformation OPTIONAL,
+		-- installation address, if different from the registered address
+	connectionDate                [7] GeneralizedTime OPTIONAL,
+		-- Date the subscriber was actually connected
+		-- (May differ from the start of subscription)
+	iMSI                          [8] IMSI OPTIONAL,
+    sUPI                          [9] SUPI OPTIONAL,
+    gPSI                          [10] GPSI OPTIONAL,
+	lineStatus                    [11] UTF8String OPTIONAL,
+		-- Edge ASP-specific description of current line status,
+		-- e.g. "Active", "Ceased", etc.
+	paymentDetails                [12] PaymentDetails OPTIONAL,
+	subscriptionType              [13] SubscriptionType OPTIONAL,
+		-- Describes the nature of the subscription
+	deliveryAddress               [14] AddressInformation OPTIONAL,
+	resellerAddress               [15] AddressInformation OPTIONAL,
+	otherAddresses                [16] SEQUENCE OF OtherAddress OPTIONAL,
+	orderTime                     [17] GeneralizedTime OPTIONAL,
+		-- Time when the subscribed edge computing application was ordered by the user
+	allocatedDeviceIDs            [18] SEQUENCE OF EdgeComputingDeviceID OPTIONAL,
+	paymentTransactions           [19] SEQUENCE OF EdgeComputingApplicationBillingRecords OPTIONAL
+}
+
+
+-- =================================
+-- Definitions of Edge Computing Application Usage Data
+-- =================================
+
+EdgeComputingApplicationUsage ::= SEQUENCE
+{
+	subscriberID                        [1] EdgeComputingSubscriberID OPTIONAL,
+	communicationTime                   [2] TimeSpan OPTIONAL,
+		-- Time and duration of the edge computing application session.
+	octetsSent                          [3] INTEGER OPTIONAL,
+    octetsReceived                      [4] INTEGER OPTIONAL,
+    reasonCause                         [5] UTF8String OPTIONAL,
+		-- cause for application session termination
+	qualityOfService                    [6] QualityOfService OPTIONAL,
+	edgeComputingApplicationID          [7] UTF8String OPTIONAL,
+	providerID       				    [8] UTF8String OPTIONAL,
+	cdrNumber						    [9] UTF8String OPTIONAL, -- as per ASP defined format
+	clientIP						    [10] IPAddress OPTIONAL,
+	edgeApplicationServersInfo          [11] SEQUENCE OF EdgeApplicationServerInfo
+}
+
+EdgeApplicationServerInfo ::= SEQUENCE
+{
+	edgeApplicationServerID                 [1] UTF8String OPTIONAL, 
+    edgeApplicationServerIP                 [2] IPAddress OPTIONAL,
+    edgeApplicationServerLocation           [3] Location OPTIONAL,
+    edgeApplicationServerVirtualResources   [4] EdgeApplicationServerVirtualResources OPTIONAL,
+    serviceContinuity                       [5] BOOLEAN OPTIONAL
+}
+
+EdgeApplicationServerVirtualResources ::= SEQUENCE
+{
+    meanVirtualCPUUsage         [1] REAL OPTIONAL,
+    meanVirtualMemoryUsage      [2] REAL OPTIONAL,
+    meanVirtualDiskUsage        [3] REAL OPTIONAL,
+    durationStartTime           [4] GeneralizedTime OPTIONAL,
+    durationEndTime             [5] GeneralizedTime OPTIONAL
+}
+
+-- ==============================
+-- Definitions of Edge Computing Billing Data
+-- ==============================
+
+EdgeComputingApplicationBillingDetails ::= SEQUENCE
+{
+	subscriberID						[1] EdgeComputingSubscriberID OPTIONAL,
+	edgeComputingApplicationID		    [2] UTF8String OPTIONAL,
+	billingAddress						[3] ContactDetails OPTIONAL,
+	billingIdentifier					[4] EdgeComputingBillingIdentifier OPTIONAL,
+	billingRecords						[5] SEQUENCE OF EdgeComputingApplicationBillingRecords OPTIONAL,
+	edgeComputingBillingAddress	        [6] EdgeComputingBillingAddress OPTIONAL,
+	copyOfBill							[7] SEQUENCE OF File OPTIONAL
+}
+
+EdgeComputingBillingAddress ::= SEQUENCE
+{
+	addressSuppliedTime			[1] GeneralizedTime OPTIONAL,
+	name						[2] PersonName OPTIONAL,
+	address						[3] AddressInformation OPTIONAL
+}
+
+EdgeComputingBillingIdentifier ::= OCTET STRING
+	-- Used to correlate billing information
+	-- useful if the bill-payer is not the subscriber, e.g. company mobiles
+
+EdgeComputingApplicationBillingRecords ::= SEQUENCE
+{
+	time								[1] GeneralizedTime OPTIONAL,
+	place								[2] UTF8String OPTIONAL,
+	amount								[3] REAL OPTIONAL,
+	currency							[4] UTF8String (SIZE(3)) OPTIONAL,
+		-- as per ISO 4217 [5]
+	method								[5] UTF8String OPTIONAL,
+		-- i.e. credit card etc.
+	edgeComputingTransactionID			[6] UTF8String OPTIONAL,
+		-- Unique reference for this transaction/billing record
+		-- Details to be defined on a national basis
+	edgeComputingTransactionStatus		[7] UTF8String OPTIONAL
+		-- Status of the transaction (i.e. "declined", "succeeded", etc.)
+		-- Details to be defined on a national bases
+}
+
+-- =======================
+-- Definitions of Edge Computing Device Data
+-- =======================
+
+EdgeComputingDevice ::= SEQUENCE
+{
+	deviceIDType				[1] ENUMERATED
+		-- Type of identifier for telephony device
+	{
+		unknown(0),
+		imei(1),
+		macAddress(2),
+		...
+	} OPTIONAL,
+	edgeComputingDeviceID		[2] EdgeComputingDeviceID OPTIONAL,
+		-- Unique identifier for this device according to type of identifier
+	subscriberID				[3] EdgeComputingSubscriberID OPTIONAL
+		-- Identifier for a known user of this equipment.
+		-- Usage of this parameter is subject to national legislation.
+	
+}
+
+EdgeComputingDeviceID ::= OCTET STRING
+	-- A unique identifier for the edge computing device. For example, the IMEI number
+	-- of a mobile handset
+
 -- =============================================
 -- Definitions of Network Access Subscriber Data
 -- =============================================
diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index 39e55512ac79b1e3e6ae8250d6f66738ab25ca8a..8539ed1976f87fe07dabde172c9c0499e12e18cb 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.28.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.28.1#/RetainedData" elementFormDefault="qualified">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.29.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.29.1#/RetainedData" elementFormDefault="qualified">
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.28.1
+            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.29.1
         </xsd:documentation>
 	</xsd:annotation>
 	<xsd:simpleType name="GeneralizedTime">
@@ -3317,4 +3317,189 @@
 			<xsd:maxLength value="22"/>
 		</xsd:restriction>
 	</xsd:simpleType>
+	<xsd:complexType name="EdgeComputingRecord">
+        <xsd:choice>
+            <xsd:element name="edgeComputingSubscriber" type="EdgeComputingSubscriber"/>
+            <xsd:element name="edgeComputingApplicationBillingDetails" type="EdgeComputingApplicationBillingDetails"/>
+            <xsd:element name="edgeComputingApplicationUsage" type="EdgeComputingApplicationUsage"/>
+            <xsd:element name="edgeComputingDevice" type="EdgeComputingDevice"/>
+        </xsd:choice>
+    </xsd:complexType>
+
+    <xsd:complexType name="EdgeComputingSubscriber">
+        <xsd:sequence>
+            <xsd:element name="subscriberID" type="EdgeComputingSubscriberID" minOccurs="0"/>
+            <xsd:element name="genericSubscriberInfo" type="GenericSubscriberInfo" minOccurs="0"/>
+            <xsd:element name="edgeComputingSubscriberInfo" type="EdgeComputingSubscriberInfo" minOccurs="0"/>
+            <xsd:element name="subscribedEdgeComputingApplications" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="SubscribedEdgeComputingApplications" type="SubscribedEdgeComputingApplications"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+    <xsd:simpleType name="EdgeComputingSubscriberID">
+        <xsd:restriction base="xsd:string"/>
+    </xsd:simpleType>
+    <xsd:simpleType name="EdgeComputingSubscriberInfo">
+                <xsd:restriction base="xsd:string"/>
+    </xsd:simpleType>
+
+    <xsd:complexType name="SubscribedEdgeComputingApplications">
+        <xsd:sequence>
+            <xsd:element name="edgeComputingApplicationID" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="providerID" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="timeSpan" type="TimeSpan" minOccurs="0"/>
+            <xsd:element name="registeredIdentifiers" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="edgeComputingApplicationType" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="installationAddress" type="AddressInformation" minOccurs="0"/>
+            <xsd:element name="connectionDate" type="GeneralizedTime" minOccurs="0"/>
+            <xsd:element name="iMSI" type="IMSI" minOccurs="0"/>
+            <xsd:element name="sUPI" type="SUPI" minOccurs="0"/>
+            <xsd:element name="gPSI" type="GPSI" minOccurs="0"/>
+            <xsd:element name="lineStatus" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="paymentDetails" type="PaymentDetails" minOccurs="0"/>
+            <xsd:element name="subscriptionType" type="SubscriptionType" minOccurs="0"/>
+            <xsd:element name="deliveryAddress" type="AddressInformation" minOccurs="0"/>
+            <xsd:element name="resellerAddress" type="AddressInformation" minOccurs="0"/>
+            <xsd:element name="otherAddresses" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="OtherAddress" type="OtherAddress"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="orderTime" type="GeneralizedTime" minOccurs="0"/>
+            <xsd:element name="allocatedDeviceIDs" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="EdgeComputingDeviceID" type="EdgeComputingDeviceID"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="paymentTransactions" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="EdgeComputingApplicationBillingRecords" type="EdgeComputingApplicationBillingRecords"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="EdgeComputingApplicationUsage">
+        <xsd:sequence>
+           <xsd:element name="subscriberID" type="EdgeComputingSubscriberID" minOccurs="0"/>
+            <xsd:element name="communicationTime" type="TimeSpan" minOccurs="0"/>
+            <xsd:element name="octetsSent" type="xsd:int" minOccurs="0"/>
+            <xsd:element name="octetsReceived" type="xsd:int" minOccurs="0"/>
+            <xsd:element name="reasonCause" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="qualityOfService" type="QualityOfService" minOccurs="0"/>
+            <xsd:element name="edgeComputingApplicationID" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="providerID" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="cdrNumber" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="clientIP" type="IPAddress" minOccurs="0"/>
+            <xsd:element name="edgeApplicationServersInfo" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="EdgeApplicationServerInfo" type="EdgeApplicationServerInfo"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="EdgeApplicationServerInfo">
+        <xsd:sequence>
+            <xsd:element name="edgeApplicationServerID" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="edgeApplicationServerIP" type="IPAddress" minOccurs="0"/>
+            <xsd:element name="edgeApplicationServerLocation" type="Location" minOccurs="0"/>
+            <xsd:element name="edgeApplicationServerVirtualResources" type="EdgeApplicationServerVirtualResources" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="EdgeApplicationServerVirtualResources">
+        <xsd:sequence>
+            <xsd:element name="meanVirtualCPUUsage" type="xsd:float" minOccurs="0"/>
+            <xsd:element name="meanVirtualMemoryUsage" type="xsd:float" minOccurs="0"/>
+            <xsd:element name="meanVirtualDiskUsage" type="xsd:float" minOccurs="0"/>
+            <xsd:element name="durationStartTime" type="GeneralizedTime" minOccurs="0"/>
+            <xsd:element name="durationEndTime" type="GeneralizedTime" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="EdgeComputingApplicationBillingDetails">
+        <xsd:sequence>
+            <xsd:element name="subscriberID" type="EdgeComputingSubscriberID" minOccurs="0"/>
+            <xsd:element name="edgeComputingApplicationID" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="billingAddress" type="ContactDetails" minOccurs="0"/>
+            <xsd:element name="billingIdentifier" type="EdgeComputingBillingIdentifier" minOccurs="0"/>
+            <xsd:element name="billingRecords" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="EdgeComputingApplicationBillingRecords" type="EdgeComputingApplicationBillingRecords"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="edgeComputingBillingAddress" type="EdgeComputingBillingAddress" minOccurs="0"/>
+            <xsd:element name="copyOfBill" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="File" type="File"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+		</xsd:sequence>
+    </xsd:complexType>
+	
+    <xsd:complexType name="EdgeComputingBillingAddress">
+        <xsd:sequence>
+            <xsd:element name="addressSuppliedTime" type="GeneralizedTime" minOccurs="0"/>
+            <xsd:element name="name" type="PersonName" minOccurs="0"/>
+            <xsd:element name="address" type="AddressInformation" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:simpleType name="EdgeComputingBillingIdentifier">
+        <xsd:restriction base="xsd:string"/>
+    </xsd:simpleType>
+
+    <xsd:complexType name="EdgeComputingApplicationBillingRecords">
+        <xsd:sequence>
+            <xsd:element name="time" type="GeneralizedTime" minOccurs="0"/>
+            <xsd:element name="place" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="amount" type="xsd:double" minOccurs="0"/>
+            <xsd:element name="currency" minOccurs="0">
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                        <xsd:length value="3"/>
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:element>
+            <xsd:element name="method" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="edgeComputingTransactionID" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="edgeComputingTransactionStatus" type="xsd:string" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+
+    <xsd:complexType name="EdgeComputingDevice">
+        <xsd:sequence>
+            <xsd:element name="deviceIDType" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:choice>
+                        <xsd:element name="unknown" type="NULL"/>
+                        <xsd:element name="imei" type="NULL"/>
+                        <xsd:element name="macAddress" type="NULL"/>
+                    </xsd:choice>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="edgeComputingDeviceID" type="EdgeComputingDeviceID" minOccurs="0"/>
+            <xsd:element name="subscriberID" type="EdgeComputingSubscriberID" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+<xsd:simpleType name="EdgeComputingDeviceID">
+        <xsd:restriction base="xsd:hexBinary"/>
+    </xsd:simpleType>
 </xsd:schema>
diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
index d5711021a34fd13dc744ab71d790c72a08c58c59..45d63437505c96368e2cf631b995680c7a3f8033 100644
--- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
+++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
@@ -144,6 +144,16 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
+	<Dictionary>   											<!--AuthorisationTypeOfCase: see Clause 7.2.14 -->
+        <Owner>ETSI</Owner>
+        <Name>AuthorisationTypeOfCase</Name>
+        <DictionaryEntries>
+            <DictionaryEntry>
+                <Value>NotSpecified</Value>
+                <Meaning>The type of case is not specified</Meaning>
+            </DictionaryEntry>
+        </DictionaryEntries>
+    </Dictionary>
 	<Dictionary>   											<!--DocumentStatus: see Clause 7.3.4 Table 7.11 -->
 		<Owner>ETSI</Owner>
 		<Name>DocumentStatus</Name>
@@ -228,6 +238,24 @@
 			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
+	<Dictionary>   											<!--TrafficAction: see Clause 7.6.3 -->
+        <Owner>ETSI</Owner>
+        <Name>TrafficAction</Name>
+        <DictionaryEntries>
+            <DictionaryEntry>
+                <Value>PDSR</Value>
+                <Meaning>Traffic that matches this policy is delivered as Packet Data Summary Reports</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>PDHR</Value>
+                <Meaning>Traffic that matches this policy is delivered as Packet Data Header Reports</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>NotDelivered</Value>
+                <Meaning>Traffic that matches this policy is not delivered</Meaning>
+            </DictionaryEntry>
+        </DictionaryEntries>
+    </Dictionary>	
 	<Dictionary>   											<!--TaskStatus: see Clause 8.2.3 Table 8.2 -->
 		<Owner>ETSI</Owner>
 		<Name>TaskStatus</Name>
diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml
index ab1b79ea3216856cd5cde2b9ac99880b43b23b3d..67dc555ea5b19691a0a799f95d6a3192e6e2a18b 100644
--- a/103120/examples/mutliple-auth-example-request.xml
+++ b/103120/examples/mutliple-auth-example-request.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>d442c58c-d5e1-4fd9-90ec-9c228ad947f1</TransactionIdentifier>
     <Timestamp>2020-09-22T08:06:17.025833Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.1.1</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml
index 2479534c73654e0576c1db35cb8a8eafbe6271d9..d38125b55891b7f0194d9648f9b3f6de2f2827f4 100644
--- a/103120/examples/request1.xml
+++ b/103120/examples/request1.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
     <Timestamp>2015-09-01T12:00:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml
index 582bb6e4b0dae70594ded44c55bad4a6af5a90ef..fe4b781a1b1fead2285b00a50109822f367ba68e 100644
--- a/103120/examples/request2.xml
+++ b/103120/examples/request2.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
     <Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml
index 7168d8401745d33330730bd9070055ebe2a41650..00e43d02071a6582cdd3fd175086353f72105e76 100644
--- a/103120/examples/request3.xml
+++ b/103120/examples/request3.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>69353ac0-9582-4c71-b162-86259c99de20</TransactionIdentifier>
     <Timestamp>2015-09-01T12:02:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml
index 9093778542fe2decd848fb7b159525838d898ed9..d18f0f6a19f27ee846e9e0c19cfc16239df1b8c2 100644
--- a/103120/examples/request4.xml
+++ b/103120/examples/request4.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Delivery.xml
index 27b7f8a83614ebf1913c6c9760736a196930bfe3..de740f5b8087c9e0960cbde2fde6a47c00ae8c6c 100644
--- a/103120/examples/request5-Binary-Delivery.xml
+++ b/103120/examples/request5-Binary-Delivery.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Delivery.xml
index 57b627c5d495284298f3e6d164ea9affd718849b..5a3b6f22ddd022582349307b650026465c7cf362 100644
--- a/103120/examples/request5-XML-Delivery.xml
+++ b/103120/examples/request5-XML-Delivery.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/request6.xml b/103120/examples/request6.xml
index 5ff9ed243e3e2ab8da1c4e1f3589cf1d28b10b76..d4646ea96851682f697c8586035546dc1c3659ad 100644
--- a/103120/examples/request6.xml
+++ b/103120/examples/request6.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2f</TransactionIdentifier>
     <Timestamp>2021-10-11T13:37:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
@@ -63,7 +63,10 @@
               <task:DeliveryDetails>
                 <task:LDDeliveryDestination>
                   <task:DeliveryAddress>
-                    <task:IPv4Address>192.0.2.0</task:IPv4Address>
+                    <task:EndpointID>
+                     <CountryCode>XX</CountryCode>
+                     <UniqueIdentifier>ACTOR01</UniqueIdentifier>
+                    </task:EndpointID>
                   </task:DeliveryAddress>
                 </task:LDDeliveryDestination>
               </task:DeliveryDetails>
diff --git a/103120/examples/request6_signed.xml b/103120/examples/request6_signed.xml
index 61bbf4399da17ef7ef79681f892bf8f91c09f052..05ca015bc91259fad7ae0a7d86eb7508757bc11f 100644
--- a/103120/examples/request6_signed.xml
+++ b/103120/examples/request6_signed.xml
@@ -11,7 +11,7 @@
     <TransactionIdentifier>9964584e-c1a5-4ffa-b949-d9da504c4efb</TransactionIdentifier>
     <Timestamp>2021-06-25T12:00:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml
new file mode 100644
index 0000000000000000000000000000000000000000..38d48c19b46dc569af7702a31a760af0efbb96b1
--- /dev/null
+++ b/103120/examples/request7_TrafficPolicyObject.xml
@@ -0,0 +1,81 @@
+<?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:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:policy="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy" xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task">
+  <Header>
+    <SenderIdentifier>
+      <CountryCode>XX</CountryCode>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
+    </SenderIdentifier>
+    <ReceiverIdentifier>
+      <CountryCode>XX</CountryCode>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
+    </ReceiverIdentifier>
+    <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaa8eb</TransactionIdentifier>
+    <Timestamp>2022-07-01T12:00:00.000000Z</Timestamp>
+    <Version>
+      <ETSIVersion>V1.12.1</ETSIVersion>
+      <NationalProfileOwner>XX</NationalProfileOwner>
+      <NationalProfileVersion>v1.0</NationalProfileVersion>
+    </Version>
+  </Header>
+  <Payload>
+    <RequestPayload>
+      <ActionRequests>
+        <ActionRequest>
+          <ActionIdentifier>0</ActionIdentifier>
+          <CREATE>
+            <HI1Object xsi:type="policy:TrafficRuleObject">
+              <ObjectIdentifier>f69eb93b-a85b-4ff7-abaa-6f3aead286d5</ObjectIdentifier>
+              <CountryCode>XX</CountryCode>
+              <OwnerIdentifier>ACTOR01</OwnerIdentifier>
+              <policy:Criteria>
+                <policy:Criteria>
+                  <policy:IPPolicyCriteria>
+                    <policy:SourceIPRange>
+                      <etsi:IPv4CIDR>203.0.113.0/24</etsi:IPv4CIDR>
+                    </policy:SourceIPRange>
+                  </policy:IPPolicyCriteria>
+                </policy:Criteria>
+              </policy:Criteria>
+              <policy:Action>
+                <common:Owner>ETSI</common:Owner>
+                <common:Name>PolicyAction</common:Name>
+                <common:Value>PDSR</common:Value>
+              </policy:Action>
+            </HI1Object>
+          </CREATE>
+        </ActionRequest>
+        <ActionRequest>
+          <ActionIdentifier>1</ActionIdentifier>
+          <CREATE>
+            <HI1Object xsi:type="policy:TrafficPolicyObject">
+              <ObjectIdentifier>55e25c0a-787b-4049-b7fb-518a13a9483b</ObjectIdentifier>
+              <CountryCode>XX</CountryCode>
+              <OwnerIdentifier>ACTOR01</OwnerIdentifier>
+              <policy:TrafficPolicyName>Template Rule 1</policy:TrafficPolicyName>
+              <policy:TrafficRules>
+                <policy:TrafficRuleReference>
+                  <policy:Order>1</policy:Order>
+                  <policy:ObjectIdentifier>f69eb93b-a85b-4ff7-abaa-6f3aead286d5</policy:ObjectIdentifier>
+                </policy:TrafficRuleReference>
+              </policy:TrafficRules>
+            </HI1Object>
+          </CREATE>
+        </ActionRequest>
+        <ActionRequest>
+          <ActionIdentifier>1</ActionIdentifier>
+          <UPDATE>
+            <HI1Object xsi:type="task:LITaskObject">
+              <ObjectIdentifier>2b36a78b-b628-416d-bd22-404e68a0cd36</ObjectIdentifier>
+              <task:ListOfTrafficPolicyReferences>
+                <task:TrafficPolicyReference>
+                  <task:Order>1</task:Order>
+                  <task:ObjectIdentifier>f69eb93b-a85b-4ff7-abaa-6f3aead286d5</task:ObjectIdentifier>
+                </task:TrafficPolicyReference>
+              </task:ListOfTrafficPolicyReferences>
+            </HI1Object>
+          </UPDATE>
+        </ActionRequest>
+      </ActionRequests>
+    </RequestPayload>
+  </Payload>
+</HI1Message>
diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml
index 7a989b9977170a745de48e156c9ddb2e2d3f9fd5..89c64f0df12d8a6173dc08337431fa24c0bf3178 100644
--- a/103120/examples/response1.xml
+++ b/103120/examples/response1.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
     <Timestamp>2015-09-01T12:00:01.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml
index a08f8d689d47309315b8671ffb381c5584e2281b..cd2c6680f593584b0f92c55a00d27382eaf717f9 100644
--- a/103120/examples/response2.xml
+++ b/103120/examples/response2.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
     <Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml
index 184967b2f7b43940235d7eeb64ef928c2fe1eb00..3b870870bb32d566f119d72358438cc5f341a1c6 100644
--- a/103120/examples/response3.xml
+++ b/103120/examples/response3.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>69353ac0-9582-4c71-b162-86259c99de20</TransactionIdentifier>
     <Timestamp>2015-09-01T12:02:00.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml
index 3c9f48204be94ed3a05329b0c24f92469294d716..4840c7330859def19ba56b90f5a8634a8fe72d1e 100644
--- a/103120/examples/response4.xml
+++ b/103120/examples/response4.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:01.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml
index 54572b35ffde7b3ee89b5b11d0e179bf0c8e274e..573253354a0cdf982c57db4c4201af009168e0af 100644
--- a/103120/examples/response5.xml
+++ b/103120/examples/response5.xml
@@ -17,7 +17,7 @@
     <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
     <Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/examples/response6.xml b/103120/examples/response6.xml
index f5ab20932f9440d9a40772f725162cb45fd197eb..12325ea255a465d4c6293d80d03959ea61ea1924 100644
--- a/103120/examples/response6.xml
+++ b/103120/examples/response6.xml
@@ -12,7 +12,7 @@
     <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2f</TransactionIdentifier>
     <Timestamp>2021-10-11T13:37:01.000000Z</Timestamp>
     <Version>
-      <ETSIVersion>V1.11.1</ETSIVersion>
+      <ETSIVersion>V1.12.1</ETSIVersion>
       <NationalProfileOwner>XX</NationalProfileOwner>
       <NationalProfileVersion>v1.0</NationalProfileVersion>
     </Version>
diff --git a/103120/schema/ts_103120_Authorisation.xsd b/103120/schema/ts_103120_Authorisation.xsd
index 72e87c0407ab6750187b5283c95fbf2ff85fe1d0..408c4ad0c8023c0b9fb883c5ced78e97a3c16aeb 100644
--- a/103120/schema/ts_103120_Authorisation.xsd
+++ b/103120/schema/ts_103120_Authorisation.xsd
@@ -31,6 +31,9 @@
 					<xs:element name="AuthorisationFlags" type="AuthorisationFlags" minOccurs="0"></xs:element>
 					<xs:element name="AuthorisationManualInformation" type="etsi:LongString" minOccurs="0"></xs:element>
 					<xs:element name="NationalAuthorisationParameters" type="NationalAuthorisationParameters" minOccurs="0"></xs:element>
+					<xs:element name="AuthorisationJurisdiction" type="etsi:LongString" minOccurs="0"></xs:element>
+					<xs:element name="AuthorisationTypeOfCase" type="common:DictionaryEntry" minOccurs="0"></xs:element>
+					<xs:element name="AuthorisationLegalEntity" type="etsi:ShortString" minOccurs="0"></xs:element>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
diff --git a/103120/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd
index 4459cf959f5840a0db2c206b1f5543975458bdee..734700c539c3b72edd8a8e007e3f64ec6b346315 100644
--- a/103120/schema/ts_103120_Task.xsd
+++ b/103120/schema/ts_103120_Task.xsd
@@ -27,8 +27,9 @@
 					<xs:element name="CSPID" type="core:EndpointID" minOccurs="0"/>
 					<xs:element name="HandlingProfile" type="common:DictionaryEntry" minOccurs="0"/>
 					<xs:element name="InvalidReason" type="core:ActionUnsuccesfulInformation" minOccurs="0"/>
-					<xs:element name="Flags" type="TaskFlags" minOccurs="0" />
+					<xs:element name="Flags" type="TaskFlags" minOccurs="0"/>
 					<xs:element name="NationalLITaskingParameters" type="NationalLITaskingParameters" minOccurs="0"/>
+        			<xs:element name="ListOfTrafficPolicyReferences" type="ListOfTrafficPolicyReferences" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -85,12 +86,13 @@
 			<xs:element name="IPv4Address" type="etsi:IPv4Address"></xs:element>
 			<xs:element name="IPv6Address" type="etsi:IPv6Address"></xs:element>
 			<xs:element name="IPAddressPort" type="etsi:IPAddressPort"></xs:element>
-			<xs:element name="IPAddressPortRange" type="etsi:IPAddressPortRange"></xs:element>			
+			<xs:element name="IPAddressPortRange" type="etsi:IPAddressPortRange"></xs:element>
 			<xs:element name="E164Number" type="etsi:InternationalE164"></xs:element>
 			<xs:element name="FTPAddress" type="xs:anyURI"></xs:element>
 			<xs:element name="URL" type="xs:anyURI"></xs:element>
 			<xs:element name="FQDN" type="etsi:LongString"></xs:element>
 			<xs:element name="EmailAddress" type="etsi:EmailAddress"></xs:element>
+			<xs:element name="EndpointID" type="core:EndpointID"></xs:element>
 		</xs:choice>
 	</xs:complexType>
 	<xs:complexType name="TaskFlags">
@@ -140,6 +142,7 @@
 			<xs:element name="ObservedTime" type="etsi:QualifiedDateTime" minOccurs="0"/>
 			<xs:element name="ObservedTimes" type="etsi:QualifiedDateTime" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="RequestValues" type="RequestValues" minOccurs="0"/>
+			<xs:element name="Subtype" type="RequestSubtype" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="RequestValues">
@@ -153,6 +156,11 @@
 			<xs:element name="Value" type="etsi:LongString"/>
 		</xs:sequence>
 	</xs:complexType>
+	<xs:complexType name="RequestSubtype">
+		<xs:sequence>
+			<xs:element name="RequestSubtype" type="common:DictionaryEntry" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
 	<xs:complexType name="LDDeliveryDetails">
 		<xs:sequence>
 			<xs:element name="LDDeliveryDestination" type="LDDeliveryDestination" minOccurs="1" maxOccurs="unbounded"/>
@@ -177,4 +185,15 @@
 			<xs:element name="CountryCode" type="etsi:ISOCountryCode"/>
 		</xs:sequence>
 	</xs:complexType>
+ 	<xs:complexType name="ListOfTrafficPolicyReferences">
+		<xs:sequence>
+			<xs:element name="TrafficPolicyReference" type="TrafficPolicyReference" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="TrafficPolicyReference">
+		<xs:sequence>
+			<xs:element name="Order" type="xs:positiveInteger" minOccurs="0"/>
+			<xs:element name="ObjectIdentifier" type="core:ObjectIdentifier" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
 </xs:schema>
diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..4f81af0a148a93fcf4eff886f569adc0a4250101
--- /dev/null
+++ b/103120/schema/ts_103120_TrafficPolicy.xsd
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" xmlns="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy" targetNamespace="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy" elementFormDefault="qualified" attributeFormDefault="unqualified">
+    <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>
+    <xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core"/>
+    <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+    <xs:complexType name="TrafficPolicyObject">
+        <xs:complexContent>
+            <xs:extension base="core:HI1Object">
+                <xs:sequence>
+                    <xs:element name="TrafficPolicyName" type="etsi:ShortString" minOccurs="0"/>
+                    <xs:element name="TrafficRules" type="ListOfTrafficRuleReferences" minOccurs="0"/>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="ListOfTrafficRuleReferences">
+        <xs:sequence>
+            <xs:element name="TrafficRuleReference" type="TrafficRuleReference" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TrafficRuleReference">
+        <xs:sequence>
+            <xs:element name="Order" type="xs:positiveInteger"/>
+            <xs:element name="ObjectIdentifier" type="core:ObjectIdentifier"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TrafficRuleObject">
+        <xs:complexContent>
+            <xs:extension base="core:HI1Object">
+                <xs:sequence>
+                    <xs:element name="Criteria" type="ListOfTrafficCriteria" minOccurs="0"/>
+                    <xs:element name="Action" type="common:DictionaryEntry" minOccurs="0"/>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="ListOfTrafficCriteria">
+        <xs:sequence>
+          <xs:element name="Criteria" type="TrafficCriteria" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TrafficCriteria">
+        <xs:choice>
+            <xs:element name="IPPolicyCriteria" type="IPPolicyCriteria"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="IPPolicyCriteria">
+        <xs:sequence>
+            <xs:element name="IPProtocol" type="xs:nonNegativeInteger" minOccurs="0"/>
+            <xs:element name="SourceIPRange" type="etsi:IPCIDR" minOccurs="0"/>
+            <xs:element name="SourcePortRange" type="etsi:PortRange" minOccurs="0"/>
+            <xs:element name="DestinationIPRange" type="etsi:IPCIDR" minOccurs="0"/>
+            <xs:element name="DestinationPortRange" type="etsi:PortRange" minOccurs="0"/>
+            <xs:element name="BothDirections" type="xs:boolean" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+</xs:schema>
diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index dbfa03cd459465018f9d519247fa397a6cb177c0..2d5ef5a255c884d17787a1d7198c66b747eeb660 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -97,6 +97,9 @@
 			<xs:enumeration value="GetDestinationDetails"/>
 			<xs:enumeration value="GetNEStatus"/>
 			<xs:enumeration value="GetAllDetails"/>
+			<xs:enumeration value="GetAllTaskDetails"/>
+			<xs:enumeration value="GetAllDestinationDetails"/>
+			<xs:enumeration value="GetAllGenericObjectDetails"/>
 			<xs:enumeration value="ListAllDetails"/>
 			<xs:enumeration value="ReportTaskIssue"/>
 			<xs:enumeration value="ReportDestinationIssue"/>
@@ -692,6 +695,62 @@
 			<xs:element name="xId" type="XId" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
+	<!-- See section 6.4.7 -->
+	<xs:complexType name="GetAllTaskDetailsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.7 -->
+	<xs:complexType name="GetAllTaskDetailsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="listOfTaskResponseDetails" type="ListOfTaskResponseDetails" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.8 -->
+	<xs:complexType name="GetAllDestinationDetailsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.8 -->
+	<xs:complexType name="GetAllDestinationDetailsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="listOfDestinationResponseDetails" type="ListOfDestinationResponseDetails" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+<!-- See section 6.4.9 -->
+	<xs:complexType name="GetAllGenericObjectDetailsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+				<xs:element name="objectType" type="GenericObjectType" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.9 -->
+	<xs:complexType name="GetAllGenericObjectDetailsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="listOfGenericObjectResponseDetails" type="ListOfGenericObjectResponseDetails" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 	<!-- See section 6.5.2 -->
 	<xs:complexType name="ReportTaskIssueRequest">
 		<xs:complexContent>
diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1
index 68cfe54e9a3e75ef0565bd50cd1c0d4bdbc8793f..0bf52025fd2344350103148938882a37dafc8144 100644
--- a/103280/TS_103_280.asn1
+++ b/103280/TS_103_280.asn1
@@ -1,11 +1,11 @@
 Common-Parameters
-{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)}
+{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version241(241)}
 
 DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN
 
 -- Object Identifier definitions
 
-commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)}
+commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version241(241)}
 
 -- Common Parameters (below are as defined in clause 6)
 
@@ -91,4 +91,6 @@ GPSINAI ::= NAI
 
 NAI ::= UTF8String
 
+IPProtocol ::= INTEGER (0..255)
+
 END
diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd
index 3ff4ae13e53186ed51828193f383337448c8e3a1..e79d246e6a4fef8df5b5f8dc92e3f8f7402452cf 100644
--- a/103280/TS_103_280.xsd
+++ b/103280/TS_103_280.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.8.1" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.9.1" elementFormDefault="qualified">
     <xs:simpleType name="ShortString">
         <xs:restriction base="xs:string">
             <xs:maxLength value="255"/>
@@ -266,4 +266,10 @@
             <xs:pattern value="[0-9]{19,20}"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="IPProtocol">
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="0"/>
+            <xs:maxInclusive value="255"/>
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>
diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json
index 69ad1b50881635e0b2aa86dd159dc1110217da5e..a1bde12e8cf2c0d58135e37cdd05317cc16e7a31 100644
--- a/testing/xsd_compile_targets.json
+++ b/testing/xsd_compile_targets.json
@@ -38,6 +38,7 @@
             "103120/schema/ts_103120_Document.xsd",
             "103120/schema/ts_103120_Notification.xsd",
             "103120/schema/ts_103120_Task.xsd",
+            "103120/schema/ts_103120_TrafficPolicy.xsd",
             "103280/TS_103_280.xsd",
             "testing/deps/xmldsig/xmldsig-core-schema.xsd",
             "103120/examples/FooServiceSchema.xsd"