diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index b7f660b63cff740c355ad4194d8f50f00f6d9097..ed3f2f79b5bc282127f93fa7ed32a52e14951414 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) version21(21)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version22(22)}
 
 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) version21(21)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version22(22)}
 
 -- ======================================
 -- Top level definitions for RDHI wrapper
@@ -414,7 +414,8 @@ GenericSubscriberInfo ::= SEQUENCE
 {
 	organizationInfo	[1] OrganizationInfo OPTIONAL,
 	individualInfo		[2] IndividualInfo OPTIONAL,
-	...
+	...,
+	contracts					[3]	SEQUENCE OF ContractInformation OPTIONAL
 }
 
 OrganizationInfo ::= SEQUENCE
@@ -467,6 +468,16 @@ IndividualInfo ::= SEQUENCE
 		-- time that subscriber account was created
 }
 
+ContractInformation ::= SEQUENCE
+{
+	contractDesignation		[1] UTF8String OPTIONAL,
+	contractNumber			[2] UTF8String OPTIONAL,
+	otherInformation		[3] UTF8String OPTIONAL,
+	timeSpan				[4] TimeSpan OPTIONAL,
+	contractDocuments		[5] SEQUENCE OF File OPTIONAL,
+	...
+}
+
 PersonName ::= SEQUENCE
 {
 	salutation				[1] UTF8String OPTIONAL,
@@ -1293,10 +1304,15 @@ Location ::= SEQUENCE
 	nCGI						[16] NCGI OPTIONAL,
 		-- format as specified in 3GPP TS 38.413 [42].
 	n3gaLocation					[17] OCTET STRING (SIZE (4)) OPTIONAL,
-		-- format as specified in 3GPP TS 29.571 [43]
-	trackingAreaIdentifier				[18] OCTET STRING (SIZE (5..6)) OPTIONAL
+		-- The use of this parameter is not recommended, as it is not aligned
+		-- with the format specified in ETSI TS 129 571 [43]
+		-- The parameter n3gppaLocation should be used instead.
+	trackingAreaIdentifier			[18] OCTET STRING (SIZE (5..6)) OPTIONAL,
 		-- where: MCC+MNC = 3 octets, TAC (4G)   = 2 octets or
 		-- TAC (5G) = 3 octets and without length indicator
+	locationInformationSource	[19] UTF8String OPTIONAL,
+	n3gppaLocation				[20] N3gppaLocation OPTIONAL
+		-- format as specified in ETSI TS 129 571 [43]
 }
 
 NCGI ::= SEQUENCE
@@ -1305,6 +1321,18 @@ NCGI ::= SEQUENCE
     nRCellID                    [2] NRCellID
 }
 
+N3gppaLocation  ::= SEQUENCE
+{
+	n3gppTai	[1]		OCTET STRING (SIZE (5..6))	OPTIONAL,
+	n3IwfId		[2]		OCTET STRING (SIZE (5))		OPTIONAL,
+		-- Composed of the PLMN-ID (3 octets) and the N3IWF ID (2 
+		-- octets) according to ETSI TS 138 413 clause 9.3.1.57.
+	ueIpv4Addr 	[3]		IPAddress					OPTIONAL,
+	ueIpv6Addr 	[4]		IPAddress					OPTIONAL,
+	portNumber	[5]		INTEGER						OPTIONAL,
+	...
+}
+
 NRCellID ::= BIT STRING (SIZE(36))
 -- TS 38.413 [23], clause 9.3.1.7
 
@@ -1831,10 +1859,11 @@ SubscribedMultimediaServices ::= SEQUENCE
 	registeredICCIDs				[21] SEQUENCE OF ICCIDInfo OPTIONAL,
 	privateUserIdentities				[22] SEQUENCE OF IMPI OPTIONAL,
 	allocatedDeviceIDs				[23] SEQUENCE OF MultimediaDeviceID OPTIONAL,
-	paymentTransactions				[24] SEQUENCE OF MultimediaBillingRecords OPTIONAL
+	paymentTransactions			[24] SEQUENCE OF MultimediaBillingRecords OPTIONAL,
+	sUPI						[25] SUPI OPTIONAL,
+	gPSI						[26] GPSI OPTIONAL
 }
 
-
 MultimediaServiceType ::= ENUMERATED
 {
 	private(0),
@@ -2817,9 +2846,10 @@ AMFID ::= SEQUENCE
 
 AMFRegionID ::= INTEGER (0..255)
 
-AMFSetID ::= INTEGER (0..63)
+AMFSetID ::= INTEGER (0..1023)
 
-AMFPointer ::= INTEGER (0..1023)
+AMFPointer ::= INTEGER (0..63)
 
 END -- end of RDMessage
 
+
diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index 98b86bfe93dda100c15f69f19137c007a946fe18..da9edf3fbb1027a806fd4a9369f356a6d55ea4ba 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.23.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.23.1#/RetainedData" elementFormDefault="qualified">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.24.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.24.1#/RetainedData" elementFormDefault="qualified">
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.23.1
+            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.24.1
         </xsd:documentation>
 	</xsd:annotation>
 	<xsd:simpleType name="GeneralizedTime">
@@ -612,10 +612,33 @@
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
+	<xsd:complexType name="ContractInformation">
+		<xsd:sequence>
+			<xsd:element name="contractDesignation" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="contractNumber" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="otherInformation" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="timeSpan" type="TimeSpan" minOccurs="0"/>
+			<xsd:element name="contractDocuments" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence minOccurs="0" maxOccurs="unbounded">
+						<xsd:element name="File" type="File"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:complexType>
 	<xsd:complexType name="GenericSubscriberInfo">
 		<xsd:sequence>
 			<xsd:element name="organizationInfo" type="OrganizationInfo" minOccurs="0"/>
 			<xsd:element name="individualInfo" type="IndividualInfo" minOccurs="0"/>
+			<xsd:element name="contracts" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence minOccurs="0" maxOccurs="unbounded">
+						<xsd:element name="ContractInformation" type="ContractInformation"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -1435,6 +1458,31 @@
 					</xsd:restriction>
 				</xsd:simpleType>
 			</xsd:element>
+			<xsd:element name="locationInformationSource" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="n3gppaLocation" type="N3gppaLocation" minOccurs="0"/>
+			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="N3gppaLocation">
+		<xsd:sequence>
+			<xsd:element name="n3gppTai" minOccurs="0">
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:hexBinary">
+						<xsd:minLength value="5"/>
+						<xsd:maxLength value="6"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:element>
+			<xsd:element name="n3IwfId" minOccurs="0">
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:hexBinary">
+						<xsd:length value="6"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:element>
+			<xsd:element name="ueIpv4Addr" type="IPAddress" minOccurs="0"/>
+			<xsd:element name="ueIpv6Addr" type="IPAddress" minOccurs="0"/>
+			<xsd:element name="portNumber" type="xsd:integer" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -2335,13 +2383,13 @@
 	<xsd:simpleType name="AMFSetID">
 		<xsd:restriction base="xsd:unsignedShort">
 			<xsd:minInclusive value="0"/>
-			<xsd:maxInclusive value="63"/>
+			<xsd:maxInclusive value="1023"/>
 		</xsd:restriction>
 	</xsd:simpleType>
 	<xsd:simpleType name="AMFPointer">
 		<xsd:restriction base="xsd:unsignedShort">
 			<xsd:minInclusive value="0"/>
-			<xsd:maxInclusive value="1023"/>
+			<xsd:maxInclusive value="63"/>
 		</xsd:restriction>
 	</xsd:simpleType>
 	<xsd:complexType name="NAEndReason">
@@ -2707,6 +2755,8 @@
 					</xsd:sequence>
 				</xsd:complexType>
 			</xsd:element>
+			<xsd:element name="sUPI" type="SUPI" minOccurs="0"/>
+			<xsd:element name="gPSI" type="GPSI" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
diff --git a/102657/portal/RDMessagever21.txt b/102657/portal/RDMessagever22.txt
similarity index 98%
rename from 102657/portal/RDMessagever21.txt
rename to 102657/portal/RDMessagever22.txt
index b7f660b63cff740c355ad4194d8f50f00f6d9097..ed3f2f79b5bc282127f93fa7ed32a52e14951414 100644
--- a/102657/portal/RDMessagever21.txt
+++ b/102657/portal/RDMessagever22.txt
@@ -1,4 +1,4 @@
-RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version21(21)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version22(22)}
 
 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) version21(21)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version22(22)}
 
 -- ======================================
 -- Top level definitions for RDHI wrapper
@@ -414,7 +414,8 @@ GenericSubscriberInfo ::= SEQUENCE
 {
 	organizationInfo	[1] OrganizationInfo OPTIONAL,
 	individualInfo		[2] IndividualInfo OPTIONAL,
-	...
+	...,
+	contracts					[3]	SEQUENCE OF ContractInformation OPTIONAL
 }
 
 OrganizationInfo ::= SEQUENCE
@@ -467,6 +468,16 @@ IndividualInfo ::= SEQUENCE
 		-- time that subscriber account was created
 }
 
+ContractInformation ::= SEQUENCE
+{
+	contractDesignation		[1] UTF8String OPTIONAL,
+	contractNumber			[2] UTF8String OPTIONAL,
+	otherInformation		[3] UTF8String OPTIONAL,
+	timeSpan				[4] TimeSpan OPTIONAL,
+	contractDocuments		[5] SEQUENCE OF File OPTIONAL,
+	...
+}
+
 PersonName ::= SEQUENCE
 {
 	salutation				[1] UTF8String OPTIONAL,
@@ -1293,10 +1304,15 @@ Location ::= SEQUENCE
 	nCGI						[16] NCGI OPTIONAL,
 		-- format as specified in 3GPP TS 38.413 [42].
 	n3gaLocation					[17] OCTET STRING (SIZE (4)) OPTIONAL,
-		-- format as specified in 3GPP TS 29.571 [43]
-	trackingAreaIdentifier				[18] OCTET STRING (SIZE (5..6)) OPTIONAL
+		-- The use of this parameter is not recommended, as it is not aligned
+		-- with the format specified in ETSI TS 129 571 [43]
+		-- The parameter n3gppaLocation should be used instead.
+	trackingAreaIdentifier			[18] OCTET STRING (SIZE (5..6)) OPTIONAL,
 		-- where: MCC+MNC = 3 octets, TAC (4G)   = 2 octets or
 		-- TAC (5G) = 3 octets and without length indicator
+	locationInformationSource	[19] UTF8String OPTIONAL,
+	n3gppaLocation				[20] N3gppaLocation OPTIONAL
+		-- format as specified in ETSI TS 129 571 [43]
 }
 
 NCGI ::= SEQUENCE
@@ -1305,6 +1321,18 @@ NCGI ::= SEQUENCE
     nRCellID                    [2] NRCellID
 }
 
+N3gppaLocation  ::= SEQUENCE
+{
+	n3gppTai	[1]		OCTET STRING (SIZE (5..6))	OPTIONAL,
+	n3IwfId		[2]		OCTET STRING (SIZE (5))		OPTIONAL,
+		-- Composed of the PLMN-ID (3 octets) and the N3IWF ID (2 
+		-- octets) according to ETSI TS 138 413 clause 9.3.1.57.
+	ueIpv4Addr 	[3]		IPAddress					OPTIONAL,
+	ueIpv6Addr 	[4]		IPAddress					OPTIONAL,
+	portNumber	[5]		INTEGER						OPTIONAL,
+	...
+}
+
 NRCellID ::= BIT STRING (SIZE(36))
 -- TS 38.413 [23], clause 9.3.1.7
 
@@ -1831,10 +1859,11 @@ SubscribedMultimediaServices ::= SEQUENCE
 	registeredICCIDs				[21] SEQUENCE OF ICCIDInfo OPTIONAL,
 	privateUserIdentities				[22] SEQUENCE OF IMPI OPTIONAL,
 	allocatedDeviceIDs				[23] SEQUENCE OF MultimediaDeviceID OPTIONAL,
-	paymentTransactions				[24] SEQUENCE OF MultimediaBillingRecords OPTIONAL
+	paymentTransactions			[24] SEQUENCE OF MultimediaBillingRecords OPTIONAL,
+	sUPI						[25] SUPI OPTIONAL,
+	gPSI						[26] GPSI OPTIONAL
 }
 
-
 MultimediaServiceType ::= ENUMERATED
 {
 	private(0),
@@ -2817,9 +2846,10 @@ AMFID ::= SEQUENCE
 
 AMFRegionID ::= INTEGER (0..255)
 
-AMFSetID ::= INTEGER (0..63)
+AMFSetID ::= INTEGER (0..1023)
 
-AMFPointer ::= INTEGER (0..1023)
+AMFPointer ::= INTEGER (0..63)
 
 END -- end of RDMessage
 
+
diff --git a/102657/portal/RDMessagever21.xsd b/102657/portal/RDMessagever22.xsd
similarity index 98%
rename from 102657/portal/RDMessagever21.xsd
rename to 102657/portal/RDMessagever22.xsd
index 98b86bfe93dda100c15f69f19137c007a946fe18..da9edf3fbb1027a806fd4a9369f356a6d55ea4ba 100644
--- a/102657/portal/RDMessagever21.xsd
+++ b/102657/portal/RDMessagever22.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.23.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.23.1#/RetainedData" elementFormDefault="qualified">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.24.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.24.1#/RetainedData" elementFormDefault="qualified">
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.23.1
+            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.24.1
         </xsd:documentation>
 	</xsd:annotation>
 	<xsd:simpleType name="GeneralizedTime">
@@ -612,10 +612,33 @@
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
+	<xsd:complexType name="ContractInformation">
+		<xsd:sequence>
+			<xsd:element name="contractDesignation" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="contractNumber" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="otherInformation" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="timeSpan" type="TimeSpan" minOccurs="0"/>
+			<xsd:element name="contractDocuments" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence minOccurs="0" maxOccurs="unbounded">
+						<xsd:element name="File" type="File"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:complexType>
 	<xsd:complexType name="GenericSubscriberInfo">
 		<xsd:sequence>
 			<xsd:element name="organizationInfo" type="OrganizationInfo" minOccurs="0"/>
 			<xsd:element name="individualInfo" type="IndividualInfo" minOccurs="0"/>
+			<xsd:element name="contracts" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence minOccurs="0" maxOccurs="unbounded">
+						<xsd:element name="ContractInformation" type="ContractInformation"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -1435,6 +1458,31 @@
 					</xsd:restriction>
 				</xsd:simpleType>
 			</xsd:element>
+			<xsd:element name="locationInformationSource" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="n3gppaLocation" type="N3gppaLocation" minOccurs="0"/>
+			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="N3gppaLocation">
+		<xsd:sequence>
+			<xsd:element name="n3gppTai" minOccurs="0">
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:hexBinary">
+						<xsd:minLength value="5"/>
+						<xsd:maxLength value="6"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:element>
+			<xsd:element name="n3IwfId" minOccurs="0">
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:hexBinary">
+						<xsd:length value="6"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:element>
+			<xsd:element name="ueIpv4Addr" type="IPAddress" minOccurs="0"/>
+			<xsd:element name="ueIpv6Addr" type="IPAddress" minOccurs="0"/>
+			<xsd:element name="portNumber" type="xsd:integer" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -2335,13 +2383,13 @@
 	<xsd:simpleType name="AMFSetID">
 		<xsd:restriction base="xsd:unsignedShort">
 			<xsd:minInclusive value="0"/>
-			<xsd:maxInclusive value="63"/>
+			<xsd:maxInclusive value="1023"/>
 		</xsd:restriction>
 	</xsd:simpleType>
 	<xsd:simpleType name="AMFPointer">
 		<xsd:restriction base="xsd:unsignedShort">
 			<xsd:minInclusive value="0"/>
-			<xsd:maxInclusive value="1023"/>
+			<xsd:maxInclusive value="63"/>
 		</xsd:restriction>
 	</xsd:simpleType>
 	<xsd:complexType name="NAEndReason">
@@ -2707,6 +2755,8 @@
 					</xsd:sequence>
 				</xsd:complexType>
 			</xsd:element>
+			<xsd:element name="sUPI" type="SUPI" minOccurs="0"/>
+			<xsd:element name="gPSI" type="GPSI" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>