diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index 47315413f66807b10099adcd7506d26cd0bd0e56..e51ec5f373f221123ec2909d374dc8ccc5e98ca7 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) version19(19)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version20(20)}
 
 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) version19(19)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version20(20)}
 
 -- ======================================
 -- Top level definitions for RDHI wrapper
@@ -40,7 +40,10 @@ RetainedDataHeader ::= SEQUENCE
 	timeStamp		[3] GeneralizedTime,
 	thirdPartyCSPID	[4] CSPID OPTIONAL,
 	... ,
-	requestType		[5] RequestType OPTIONAL
+	requestType		[5] RequestType OPTIONAL,
+	requestFlag		[6] RequestFlag OPTIONAL
+		-- Optional parameter specifying additional information associated with the request.
+
 }
 
 CSPID ::= UTF8String
@@ -49,14 +52,19 @@ CSPID ::= UTF8String
 RequestType ::= UTF8String
 -- Description or reference of the type of Retained Data request
 
+RequestFlag ::= UTF8String
+	-- Configuration information associated with the request
+
 RequestID ::= SEQUENCE
 {
-	countryCode					[1] CountryCode,
-	authorisedOrganisationID	[2] AuthorisedOrganisationID,
+	countryCode				[1] CountryCode,
+	authorisedOrganisationID		[2] AuthorisedOrganisationID,
 	requestNumber				[3] RequestNumber OPTIONAL,
 		-- all messages except GetStatusMessage and StatusMessage have a request number
 		-- (see clause 6.1.2)
-	...
+	...,
+	externalIdentifier			[4]	ExternalIdentifier OPTIONAL
+		-- Optional identifier for the request, for correlation with warrant management systems.
 }
 
 CountryCode ::= UTF8String (SIZE(2))
@@ -68,6 +76,8 @@ AuthorisedOrganisationID::= UTF8String
 RequestNumber ::= UTF8String
 -- Unique within a given country and Authorized Organization
 
+ExternalIdentifier ::= UTF8String
+
 -- =================================================
 -- Definitions for Retained Data payload information
 -- =================================================
@@ -516,18 +526,20 @@ OtherAddress ::= SEQUENCE
 AuthenticationInfo ::= SEQUENCE
 {
 	authenticationType		[1] UTF8String OPTIONAL,
-		-- the type of document used to authenticate, e.g. passport, driver's license
-	authenticationNumber	[2] UTF8String OPTIONAL,
-		-- the number of the document used to authenticate
-	...
+	authenticationNumber		[2] UTF8String OPTIONAL,
+	...,
+	issuingCountry			[3] UTF8String (SIZE (2)) OPTIONAL,
+	issuingOrganization		[4] UTF8String OPTIONAL,
+	nationality			[5] UTF8String OPTIONAL
 }
 
 PaymentDetails ::= SEQUENCE
 {
-	billingMethod						[1] BillingMethod OPTIONAL,
-	bankAccount							[2] BankAccount OPTIONAL,
-	billingAddress						[3] ContactDetails OPTIONAL,
-	...
+	billingMethod			[1] BillingMethod OPTIONAL,
+	bankAccount			[2] BankAccount OPTIONAL,
+	billingAddress			[3] ContactDetails OPTIONAL,
+	...,
+	billingIdentifier		[4] BillingIdentifier OPTIONAL
 }
 
 BankAccount ::= SEQUENCE
@@ -563,10 +575,10 @@ BillingMethod ::= ENUMERATED
 
 TelephonyRecord ::= CHOICE
 {
-	telephonySubscriber			[1] TelephonySubscriber,
+	telephonySubscriber		[1] TelephonySubscriber,
 	telephonyBillingDetails		[2] TelephonyBillingDetails,
 	telephonyServiceUsage		[3] TelephonyServiceUsage,
-	telephonyDevice				[4] TelephonyDevice,
+	telephonyDevice			[4] TelephonyDevice,
 	telephonyNetworkElement		[5] TelephonyNetworkElement,
 	...
 }
@@ -620,7 +632,12 @@ ICCIDInfo ::= SEQUENCE
 	iCCID								[1] UTF8String OPTIONAL,
 	timeSpan							[2] TimeSpan OPTIONAL,
 		-- activation- and deactivation-date if applicable in which the ICCID was active
-	...
+	...,
+	pUK								[3] UTF8String OPTIONAL,
+		-- PUK code associated with the ICCID
+	pUK2								[4] UTF8String OPTIONAL,
+		-- PUK2 code associated with the ICCID
+	iMSI								[5] IMSI OPTIONAL
 }
 
 LoginInfo ::= SEQUENCE
@@ -1250,10 +1267,11 @@ Location ::= SEQUENCE
 	maritimeTransport		[13] MaritimeTransport OPTIONAL,
 		-- Information about the mobile cells embarked on ships using
 		-- satellite transponder backhaul
-	airTransport			[14] AirTransport OPTIONAL
-		-- Information about the mobile cells embarked on aircraft using
+	airTransport			[14] AirTransport OPTIONAL,
+		-- Information about the mobile cells embarked on aircraft using 
 		-- satellite transponder backhaul
-
+	bSSID				[15] OCTET STRING (SIZE (6)) OPTIONAL
+		-- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID
 }
 
 GSMLocation ::= CHOICE
@@ -1501,12 +1519,12 @@ MsgSubscriber ::= SEQUENCE
 	-- asynchronous message services
 {
 	validity		[1] TimeSpan OPTIONAL,
-	subscriberID	[2] MsgSubscriberID OPTIONAL,
+	subscriberID		[2] MsgSubscriberID OPTIONAL,
 	msgStores		[3] SEQUENCE OF MsgStore OPTIONAL,
 		-- message stores allocated to this subscriber
 	subscriber		[4] GenericSubscriberInfo OPTIONAL,
 	...,
-	paymentDetails	[5] PaymentDetails OPTIONAL
+	paymentDetails		[5] PaymentDetails OPTIONAL
 }
 
 MsgSubscriberID ::= OCTET STRING
@@ -1516,12 +1534,14 @@ MsgStore ::= SEQUENCE
 	-- Location into which messages are temporarily stored. All asynchronous message services by
 	-- definition require some message store. E.g. in the case of e-mail this will be a mailbox
 {
-	validity		[1] TimeSpan OPTIONAL,
-	msgStoreID		[2] MsgStoreID OPTIONAL,
-	aliases			[3] SEQUENCE OF MsgAddress OPTIONAL,
+	validity			[1] TimeSpan OPTIONAL,
+	msgStoreID			[2] MsgStoreID OPTIONAL,
+	aliases				[3] SEQUENCE OF MsgAddress OPTIONAL,
 		-- The complete list of all addresses that get delivered into this message store.
-	providerID		[4] MsgProviderID OPTIONAL,
-	...
+	providerID			[4] MsgProviderID OPTIONAL,
+	...,
+	msgForwardingAddresses		[5] SEQUENCE OF MsgAddress OPTIONAL,
+	msgStoreSubscriberRelatedIDs	[6] SEQUENCE OF ContactDetails OPTIONAL
 }
 
 MsgStoreID ::= OCTET STRING
@@ -1687,7 +1707,8 @@ MultimediaRecord ::= CHOICE
 	multimediaSubscriber		[1] MultimediaSubscriber,
 	multimediaBillingDetails	[2] MultimediaBillingDetails,
 	multimediaServiceUsage		[3] MultimediaServiceUsage,
-	...
+	...,
+	multimediaDevice		[4] MultimediaDevice
 }
 
 -- ==============================
@@ -1763,10 +1784,14 @@ SubscribedMultimediaServices ::= SEQUENCE
 	deliveryAddress				[15] AddressInformation OPTIONAL,
 	resellerAddress				[16] AddressInformation OPTIONAL,
 	otherAddresses				[17] SEQUENCE OF OtherAddress OPTIONAL,
-	multimediaServiceType		[18] UTF8String OPTIONAL,
+	multimediaServiceType			[18] UTF8String OPTIONAL,
 		-- Service name used by the service provider which may be proprietary
-	orderTime					[19] GeneralizedTime OPTIONAL
-		-- Time when the subscribed service was ordered by the user
+	orderTime				[19] GeneralizedTime OPTIONAL,
+		-- Time when the subscribed service was ordered by the user	
+	iMEIs					[20] SEQUENCE OF IMEI OPTIONAL,
+	registeredICCIDs			[21] SEQUENCE OF ICCIDInfo OPTIONAL,
+	privateUserIdentities			[22] SEQUENCE OF IMPI OPTIONAL,
+	allocatedDeviceIDs			[23] SEQUENCE OF MultimediaDeviceID OPTIONAL
 }
 
 MultimediaServiceType ::= ENUMERATED
@@ -1779,6 +1804,9 @@ MultimediaServiceType ::= ENUMERATED
 	...
 }
 
+IMPI ::= UTF8String
+	-- Private User Identity of the IP Multimedia Subsystem subscription
+
 -- =================================
 -- Definitions of Service Usage Data
 -- =================================
@@ -1791,59 +1819,62 @@ MultimediaServiceUsage ::= SEQUENCE
 		-- provided by the party
 	communicationTime				[2] TimeSpan OPTIONAL,
 		-- Time and duration of the communication
-	reasonCause						[3] INTEGER OPTIONAL,
+	reasonCause					[3] INTEGER OPTIONAL,
 		-- cause code for call termination e.g. SIP Reason code
 	communicationType				[4] MultimediaCommunicationType OPTIONAL,
 	bearerService					[5] MultimediaBearerService OPTIONAL,
 	qualityOfService				[6] QualityOfService OPTIONAL,
 	ringDuration					[7] INTEGER OPTIONAL,
-	callID							[8] MultimediaCallID OPTIONAL,
+	callID						[8] MultimediaCallID OPTIONAL,
 	originalCallID					[9] MultimediaCallID OPTIONAL,
-	callState						[10] ENUMERATED
+	callState					[10] ENUMERATED
 	{
 		bNotReached(1),
 		bAlert(2),
 		bAnswered(3),
 		...
 	} OPTIONAL,
-	answerTime						[11] GeneralizedTime OPTIONAL,
-	contentType						[12] SEQUENCE OF UTF8String OPTIONAL,
+	answerTime					[11] GeneralizedTime OPTIONAL,
+	contentType					[12] SEQUENCE OF UTF8String OPTIONAL,
 	mediaComponents					[13] SEQUENCE OF MediaComponent OPTIONAL,
 	imsInformation					[14] ImsInformation OPTIONAL,
-	nationalMultimediaServiceUsage	[15] NationalMultimediaServiceUsage OPTIONAL,
-	serviceID						[16] UTF8String OPTIONAL,
-	providerID						[17] UTF8String OPTIONAL,
+	nationalMultimediaServiceUsage			[15] NationalMultimediaServiceUsage OPTIONAL,
+	serviceID					[16] UTF8String OPTIONAL,
+	providerID					[17] UTF8String OPTIONAL,
 	...,
-	cdrNumber						[18] UTF8String OPTIONAL, -- as per CSP defined format
-	clientIP						[19] IPAddress OPTIONAL,
-	relayIP							[20] IPAddress OPTIONAL,
-	vmLength						[21] INTEGER OPTIONAL, -- number of seconds
-	reason							[22] UTF8String OPTIONAL
+	cdrNumber					[18] UTF8String OPTIONAL, -- as per CSP defined format
+	clientIP					[19] IPAddress OPTIONAL,
+	relayIP						[20] IPAddress OPTIONAL,
+	vmLength					[21] INTEGER OPTIONAL, -- number of seconds
+	reason						[22] UTF8String OPTIONAL,
+	smsInformation					[23] SmsInformation OPTIONAL,
+	mmsInformation					[24] MmsInformation OPTIONAL
 }
 
 MultimediaPartyInformation ::= SEQUENCE
 {
-	partyRole							[1] MultimediaPartyRole OPTIONAL,
+	partyRole						[1] MultimediaPartyRole OPTIONAL,
 	partyIdentity						[2] PartyIdentity OPTIONAL,
 	subscriberID						[3] MultimediaSubscriberID OPTIONAL,
 	communicationTime					[4] TimeSpan OPTIONAL,
 		-- Time and duration of the communication
-	iMSI								[6] IMSI OPTIONAL,
+	iMSI							[6] IMSI OPTIONAL,
 	natureOfAddress						[7] UTF8String OPTIONAL,
 		-- Nature of address indicator, e.g. "National", "International"
-	uRI									[8] UTF8String OPTIONAL,
-	partyNumber							[9] PartyNumber OPTIONAL,
+	uRI							[8] UTF8String OPTIONAL,
+	partyNumber						[9] PartyNumber OPTIONAL,
 	naAssignedAddress					[10] NAAssignedAddress OPTIONAL,
-	forwardedTransferredIdentifier		[11] PartyIdentity OPTIONAL,
-	terminatingTransferredIdentifier	[12] PartyIdentity OPTIONAL,
-	nationalMultimediaPartyInformation	[13] NationalMultimediaPartyInformation OPTIONAL,
+	forwardedTransferredIdentifier				[11] PartyIdentity OPTIONAL,
+	terminatingTransferredIdentifier			[12] PartyIdentity OPTIONAL,
+	nationalMultimediaPartyInformation			[13] NationalMultimediaPartyInformation OPTIONAL,
 	...,
-	userAgent							[14] UTF8String OPTIONAL,
+	userAgent						[14] UTF8String OPTIONAL,
 		-- e.g. SIP User-Agent field (see RFC 3261 [26])
 	octetsUploaded						[15] INTEGER OPTIONAL,
 	octetsDownloaded					[16] INTEGER OPTIONAL,
-	accessNetworkInformation				[17] SEQUENCE OF AccessNetworkInfo OPTIONAL
-
+	accessNetworkInformation				[17] SEQUENCE OF AccessNetworkInfo OPTIONAL,
+	privateUserIdentity					[18] IMPI OPTIONAL,
+	iMEI							[19] IMEI OPTIONAL
 }
 
 MultimediaCallID	::=	UTF8String
@@ -1853,7 +1884,11 @@ MultimediaCommunicationType	::=	ENUMERATED
 	multimediaFixed(0),
 	multimediaWireless(1),
 	multimediaNetworkIndependent(2),
-	...
+	...,
+	telephonyFixed(3),
+	telephonyWireless(4),
+	sMS(5),
+	mMS(6)
 }
 
 MultimediaPartyRole	::=	ENUMERATED
@@ -1869,7 +1904,21 @@ MultimediaPartyRole	::=	ENUMERATED
 	broadcastReceiver(8),
 	broadcastSender(9),
 	...,
-	originalCalling(10)
+	originalCalling(10),
+	forwarded-to-Party(11),
+	connected(12),
+	userProvidedCalling(13),
+	roaming(14),
+	translated(15),
+	singlePersonalNumber(16),
+	smsOriginator(17),
+	smsRecipient(18),
+	smsOriginatorTrn(19),
+	smsRecipientTrn(20),
+	mmsOriginator(21),
+	mmsRecipient(22),
+	mmsOriginatorTrn(23),
+	mmsRecipientTrn(24)
 }
 
 MultimediaBearerService	::=	ENUMERATED
@@ -2059,6 +2108,42 @@ NationalMultimediaMediaComponent ::= SEQUENCE
 	...
 }
 
+-- =======================
+-- Device Data definitions
+-- =======================
+
+MultimediaDevice ::= SEQUENCE
+{
+	deviceIDType					[1] ENUMERATED
+		-- Type of identifier for telephony device
+	{
+		unknown(0),
+		imei(1),
+		macAddress(2),
+		...
+	} OPTIONAL,
+	multimediaDeviceID				[2] MultimediaDeviceID OPTIONAL,
+		-- Unique identifier for this device according to type of identifier
+	subscriberID					[3] MultimediaSubscriberID OPTIONAL,
+		-- Identifier for a known user of this equipment.
+		-- Usage of this parameter is subject to national legislation.
+	nationalMultimediaDevice		[4] NationalMultimediaDevice OPTIONAL,
+		-- To be defined on a national basis
+		-- Only to be used in case the present document cannot fulfil the national requirements
+	...
+}
+
+NationalMultimediaDevice ::= SEQUENCE
+{
+	countryCode		[1] UTF8String (SIZE (2)),
+		-- see comment in NationalRequestParameters
+	...
+}
+
+MultimediaDeviceID ::= OCTET STRING
+	-- A unique identifier for the multimedia device. For example, the IMEI number
+	-- of a mobile handset
+
 NetworkAccessRecord::= CHOICE
 {
 	naSubscriber		[1] NASubscriber,
@@ -2100,19 +2185,19 @@ NASubscriber ::= SEQUENCE
 NAServiceSubscription ::= SEQUENCE
 	-- Description of the subscription to a Network Access service
 {
-	validity				[1] TimeSpan OPTIONAL,
-	naServiceID				[2] UTF8String OPTIONAL,
+	validity			[1] TimeSpan OPTIONAL,
+	naServiceID			[2] UTF8String OPTIONAL,
 		-- Identifier for the service, e.g. account plan name.
 	naProviderID			[3] NAProviderID OPTIONAL,
 		-- Unique identifier for the provider of the service, e.g. company name
-	naAuthID				[4] NAAuthID OPTIONAL,
+	naAuthID			[4] NAAuthID OPTIONAL,
 		-- Unique identifier for this subscription, e.g. logon name
-	options					[5] UTF8String OPTIONAL,
+	options				[5] UTF8String OPTIONAL,
 		-- Human readable text with restrictions or options to the subscription
 	installationAddress		[6] AddressInformation OPTIONAL,
 	fixIpAddress			[7] IPAddress OPTIONAL,
 		-- fix assigned IP address
-	imsi					[8] IMSI OPTIONAL,
+	imsi				[8] IMSI OPTIONAL,
 	...,
 	allocatedDeviceIDs		[9] SEQUENCE OF NADeviceId OPTIONAL,
 	naServiceStatus			[10] UTF8String OPTIONAL,
@@ -2128,8 +2213,8 @@ NAServiceSubscription ::= SEQUENCE
 	otherAddresses			[18] SEQUENCE OF OtherAddress OPTIONAL,
 	allocatedDevices		[19] SEQUENCE OF NADevice OPTIONAL,
 		-- If present, contains device details for all elements from allocatedDeviceIDs
-	mSISDNs				[20] SEQUENCE OF PartyNumber OPTIONAL
-
+	mSISDNs				[20] SEQUENCE OF PartyNumber OPTIONAL,
+	registeredICCIDs		[21] SEQUENCE OF ICCIDInfo OPTIONAL
 }
 
 NationalNASubscription ::= SEQUENCE
diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index f46fb92e70fcc5cc35e5a7cdb0219d66d322c3d6..19961bd0ec8b58f8eda59c751e4f0c2d0fc7013b 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.19.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.19.1#/RetainedData" elementFormDefault="qualified">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.22.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.22.1#/RetainedData" elementFormDefault="qualified">
     <xsd:annotation>
         <xsd:documentation xml:lang="en">
-            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.19.1
+            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.22.1
         </xsd:documentation>
     </xsd:annotation>
     <xsd:simpleType name="GeneralizedTime">
@@ -34,7 +34,7 @@
     <xsd:simpleType name="CountryCode">
         <xsd:annotation>
             <xsd:documentation xml:lang="en">
-                A country code as per ISO 3166-1 [xx]
+                A country code as per ISO 3166-1 [4]
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:string">
@@ -401,6 +401,7 @@
             <xsd:element name="countryCode" type="CountryCode"/>
             <xsd:element name="authorisedOrganisationID" type="AuthorisedOrganisationID"/>
             <xsd:element name="requestNumber" minOccurs="0" type="RequestNumber"/>
+            <xsd:element name="externalIdentifier" minOccurs="0" type="ExternalIdentifier"/>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -411,6 +412,7 @@
             <xsd:element name="timeStamp" type="GeneralizedTime"/>
             <xsd:element name="thirdPartyCSPID" minOccurs="0" type="CSPID"/>
             <xsd:element name="requestType" minOccurs="0" type="RequestType"/>
+            <xsd:element name="requestFlag" type="RequestFlag" minOccurs="0"/>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -514,6 +516,15 @@
         <xsd:sequence>
             <xsd:element name="authenticationType" minOccurs="0" type="xsd:string"/>
             <xsd:element name="authenticationNumber" minOccurs="0" type="xsd:string"/>
+            <xsd:element name="issuingCountry" minOccurs="0">
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                        <xsd:length value="2"/>
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:element>
+            <xsd:element name="issuingOrganization" minOccurs="0" type="xsd:string"/>
+            <xsd:element name="nationality" minOccurs="0" type="xsd:string"/>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -522,6 +533,7 @@
             <xsd:element name="billingMethod" minOccurs="0" type="BillingMethod"/>
             <xsd:element name="bankAccount" minOccurs="0" type="BankAccount"/>
             <xsd:element name="billingAddress" minOccurs="0" type="ContactDetails"/>
+            <xsd:element name="billingIdentifier" minOccurs="0" type="BillingIdentifier"/>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -595,6 +607,9 @@
         <xsd:sequence>
             <xsd:element name="iCCID" minOccurs="0" type="xsd:string"/>
             <xsd:element name="timeSpan" minOccurs="0" type="TimeSpan"/>
+            <xsd:element name="pUK" minOccurs="0" type="xsd:string"/>
+            <xsd:element name="pUK2" minOccurs="0" type="xsd:string"/>
+            <xsd:element name="iMSI" minOccurs="0" type="IMSI"/>
         </xsd:sequence>
     </xsd:complexType>
     <xsd:complexType name="LoginInfo">
@@ -1027,6 +1042,23 @@
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
+    <xsd:complexType name="MultimediaDevice">
+        <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="multimediaDeviceID" minOccurs="0" type="MultimediaDeviceID"/>
+            <xsd:element name="subscriberID" minOccurs="0" type="MultimediaSubscriberID"/>
+            <xsd:element name="nationalMultimediaDevice" minOccurs="0" type="NationalMultimediaDevice"/>
+            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
     <xsd:complexType name="NationalTelephonyDevice">
         <xsd:sequence>
             <xsd:element name="countryCode">
@@ -1341,6 +1373,13 @@
             </xsd:element>
             <xsd:element name="maritimeTransport" minOccurs="0" type="MaritimeTransport"/>
             <xsd:element name="airTransport" minOccurs="0" type="AirTransport"/>
+            <xsd:element name="bSSID" minOccurs="0">
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:hexBinary">
+                        <xsd:length value="6"/>
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:element>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -1507,6 +1546,20 @@
                 </xsd:complexType>
             </xsd:element>
             <xsd:element name="providerID" minOccurs="0" type="MsgProviderID"/>
+            <xsd:element name="msgForwardingAddresses" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="MsgAddress" type="MsgAddress"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="msgStoreSubscriberRelatedIDs" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="ContactDetails" type="ContactDetails"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -1745,6 +1798,13 @@
                     </xsd:sequence>
                 </xsd:complexType>
             </xsd:element>
+            <xsd:element name="registeredICCIDs" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="ICCIDInfo" type="ICCIDInfo"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -2313,6 +2373,7 @@
             <xsd:element name="multimediaSubscriber" type="MultimediaSubscriber"/>
             <xsd:element name="multimediaBillingDetails" type="MultimediaBillingDetails"/>
             <xsd:element name="multimediaServiceUsage" type="MultimediaServiceUsage"/>
+            <xsd:element name="multimediaDevice" type="MultimediaDevice"/>
             <xsd:any namespace="##other" processContents="lax"/>
         </xsd:choice>
     </xsd:complexType>
@@ -2392,6 +2453,34 @@
             </xsd:element>
             <xsd:element name="multimediaServiceType" minOccurs="0" type="xsd:string"/>
             <xsd:element name="orderTime" minOccurs="0" type="GeneralizedTime"/>
+            <xsd:element name="iMEIs" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="IMEI" type="IMEI"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="registeredICCIDs" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="ICCIDInfo" type="ICCIDInfo"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="privateUserIdentities" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence maxOccurs="unbounded">
+                        <xsd:element name="IMPI" type="IMPI"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="allocatedDeviceIDs" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="MultimediaDeviceID" type="MultimediaDeviceID"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -2456,6 +2545,8 @@
             <xsd:element name="relayIP" minOccurs="0" type="IPAddress"/>
             <xsd:element name="vmLength" minOccurs="0" type="xsd:integer"/>
             <xsd:element name="reason" minOccurs="0" type="xsd:string"/>
+            <xsd:element name="smsInformation" minOccurs="0" type="SmsInformation"/>
+            <xsd:element name="mmsInformation" minOccurs="0" type="MmsInformation"/>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -2483,6 +2574,8 @@
                     </xsd:choice>
                 </xsd:complexType>
             </xsd:element>
+            <xsd:element name="privateUserIdentity" minOccurs="0" type="IMPI"/>
+            <xsd:element name="iMEI" minOccurs="0" type="IMEI"/>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -2494,6 +2587,10 @@
             <xsd:element name="multimediaFixed" type="NULL"/>
             <xsd:element name="multimediaWireless" type="NULL"/>
             <xsd:element name="multimediaNetworkIndependent" type="NULL"/>
+            <xsd:element name="telephonyFixed" type="NULL"/>
+            <xsd:element name="telephonyWireless" type="NULL"/>
+            <xsd:element name="sMS" type="NULL"/>
+            <xsd:element name="mMS" type="NULL"/>
             <xsd:any namespace="##other" processContents="lax"/>
         </xsd:choice>
     </xsd:complexType>
@@ -2510,6 +2607,20 @@
             <xsd:element name="broadcastReceiver" type="NULL"/>
             <xsd:element name="broadcastSender" type="NULL"/>
             <xsd:element name="originalCalling" type="NULL"/>
+            <xsd:element name="forwarded-to-Party" type="NULL"/>
+            <xsd:element name="connected" type="NULL"/>
+            <xsd:element name="userProvidedCalling" type="NULL"/>
+            <xsd:element name="roaming" type="NULL"/>
+            <xsd:element name="translated" type="NULL"/>
+            <xsd:element name="singlePersonalNumber" type="NULL"/>
+            <xsd:element name="smsOriginator" type="NULL"/>
+            <xsd:element name="smsRecipient" type="NULL"/>
+            <xsd:element name="smsOriginatorTrn" type="NULL"/>
+            <xsd:element name="smsRecipientTrn" type="NULL"/>
+            <xsd:element name="mmsOriginator" type="NULL"/>
+            <xsd:element name="mmsRecipient" type="NULL"/>
+            <xsd:element name="mmsOriginatorTrn" type="NULL"/>
+            <xsd:element name="mmsRecipientTrn" type="NULL"/>
             <xsd:any namespace="##other" processContents="lax"/>
         </xsd:choice>
     </xsd:complexType>
@@ -2765,4 +2876,28 @@
             <xsd:any namespace="##other" processContents="lax"/>
         </xsd:choice>
     </xsd:complexType>
+    <xsd:simpleType name="MultimediaDeviceID">
+        <xsd:restriction base="xsd:hexBinary"/>
+    </xsd:simpleType>
+    <xsd:complexType name="NationalMultimediaDevice">
+        <xsd:sequence>
+            <xsd:element name="countryCode">
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                        <xsd:length value="2"/>
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:element>
+            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:simpleType name="ExternalIdentifier">
+        <xsd:restriction base="xsd:string"/>
+    </xsd:simpleType>
+    <xsd:simpleType name="IMPI">
+        <xsd:restriction base="xsd:string"/>
+    </xsd:simpleType>
+    <xsd:simpleType name="RequestFlag">
+        <xsd:restriction base="xsd:string"/>
+    </xsd:simpleType>
 </xsd:schema>
diff --git a/102657/portal/RDMessagever19.1.txt b/102657/portal/RDMessagever20.txt
similarity index 93%
rename from 102657/portal/RDMessagever19.1.txt
rename to 102657/portal/RDMessagever20.txt
index 47315413f66807b10099adcd7506d26cd0bd0e56..e51ec5f373f221123ec2909d374dc8ccc5e98ca7 100644
--- a/102657/portal/RDMessagever19.1.txt
+++ b/102657/portal/RDMessagever20.txt
@@ -1,4 +1,4 @@
-RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version19(19)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version20(20)}
 
 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) version19(19)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version20(20)}
 
 -- ======================================
 -- Top level definitions for RDHI wrapper
@@ -40,7 +40,10 @@ RetainedDataHeader ::= SEQUENCE
 	timeStamp		[3] GeneralizedTime,
 	thirdPartyCSPID	[4] CSPID OPTIONAL,
 	... ,
-	requestType		[5] RequestType OPTIONAL
+	requestType		[5] RequestType OPTIONAL,
+	requestFlag		[6] RequestFlag OPTIONAL
+		-- Optional parameter specifying additional information associated with the request.
+
 }
 
 CSPID ::= UTF8String
@@ -49,14 +52,19 @@ CSPID ::= UTF8String
 RequestType ::= UTF8String
 -- Description or reference of the type of Retained Data request
 
+RequestFlag ::= UTF8String
+	-- Configuration information associated with the request
+
 RequestID ::= SEQUENCE
 {
-	countryCode					[1] CountryCode,
-	authorisedOrganisationID	[2] AuthorisedOrganisationID,
+	countryCode				[1] CountryCode,
+	authorisedOrganisationID		[2] AuthorisedOrganisationID,
 	requestNumber				[3] RequestNumber OPTIONAL,
 		-- all messages except GetStatusMessage and StatusMessage have a request number
 		-- (see clause 6.1.2)
-	...
+	...,
+	externalIdentifier			[4]	ExternalIdentifier OPTIONAL
+		-- Optional identifier for the request, for correlation with warrant management systems.
 }
 
 CountryCode ::= UTF8String (SIZE(2))
@@ -68,6 +76,8 @@ AuthorisedOrganisationID::= UTF8String
 RequestNumber ::= UTF8String
 -- Unique within a given country and Authorized Organization
 
+ExternalIdentifier ::= UTF8String
+
 -- =================================================
 -- Definitions for Retained Data payload information
 -- =================================================
@@ -516,18 +526,20 @@ OtherAddress ::= SEQUENCE
 AuthenticationInfo ::= SEQUENCE
 {
 	authenticationType		[1] UTF8String OPTIONAL,
-		-- the type of document used to authenticate, e.g. passport, driver's license
-	authenticationNumber	[2] UTF8String OPTIONAL,
-		-- the number of the document used to authenticate
-	...
+	authenticationNumber		[2] UTF8String OPTIONAL,
+	...,
+	issuingCountry			[3] UTF8String (SIZE (2)) OPTIONAL,
+	issuingOrganization		[4] UTF8String OPTIONAL,
+	nationality			[5] UTF8String OPTIONAL
 }
 
 PaymentDetails ::= SEQUENCE
 {
-	billingMethod						[1] BillingMethod OPTIONAL,
-	bankAccount							[2] BankAccount OPTIONAL,
-	billingAddress						[3] ContactDetails OPTIONAL,
-	...
+	billingMethod			[1] BillingMethod OPTIONAL,
+	bankAccount			[2] BankAccount OPTIONAL,
+	billingAddress			[3] ContactDetails OPTIONAL,
+	...,
+	billingIdentifier		[4] BillingIdentifier OPTIONAL
 }
 
 BankAccount ::= SEQUENCE
@@ -563,10 +575,10 @@ BillingMethod ::= ENUMERATED
 
 TelephonyRecord ::= CHOICE
 {
-	telephonySubscriber			[1] TelephonySubscriber,
+	telephonySubscriber		[1] TelephonySubscriber,
 	telephonyBillingDetails		[2] TelephonyBillingDetails,
 	telephonyServiceUsage		[3] TelephonyServiceUsage,
-	telephonyDevice				[4] TelephonyDevice,
+	telephonyDevice			[4] TelephonyDevice,
 	telephonyNetworkElement		[5] TelephonyNetworkElement,
 	...
 }
@@ -620,7 +632,12 @@ ICCIDInfo ::= SEQUENCE
 	iCCID								[1] UTF8String OPTIONAL,
 	timeSpan							[2] TimeSpan OPTIONAL,
 		-- activation- and deactivation-date if applicable in which the ICCID was active
-	...
+	...,
+	pUK								[3] UTF8String OPTIONAL,
+		-- PUK code associated with the ICCID
+	pUK2								[4] UTF8String OPTIONAL,
+		-- PUK2 code associated with the ICCID
+	iMSI								[5] IMSI OPTIONAL
 }
 
 LoginInfo ::= SEQUENCE
@@ -1250,10 +1267,11 @@ Location ::= SEQUENCE
 	maritimeTransport		[13] MaritimeTransport OPTIONAL,
 		-- Information about the mobile cells embarked on ships using
 		-- satellite transponder backhaul
-	airTransport			[14] AirTransport OPTIONAL
-		-- Information about the mobile cells embarked on aircraft using
+	airTransport			[14] AirTransport OPTIONAL,
+		-- Information about the mobile cells embarked on aircraft using 
 		-- satellite transponder backhaul
-
+	bSSID				[15] OCTET STRING (SIZE (6)) OPTIONAL
+		-- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID
 }
 
 GSMLocation ::= CHOICE
@@ -1501,12 +1519,12 @@ MsgSubscriber ::= SEQUENCE
 	-- asynchronous message services
 {
 	validity		[1] TimeSpan OPTIONAL,
-	subscriberID	[2] MsgSubscriberID OPTIONAL,
+	subscriberID		[2] MsgSubscriberID OPTIONAL,
 	msgStores		[3] SEQUENCE OF MsgStore OPTIONAL,
 		-- message stores allocated to this subscriber
 	subscriber		[4] GenericSubscriberInfo OPTIONAL,
 	...,
-	paymentDetails	[5] PaymentDetails OPTIONAL
+	paymentDetails		[5] PaymentDetails OPTIONAL
 }
 
 MsgSubscriberID ::= OCTET STRING
@@ -1516,12 +1534,14 @@ MsgStore ::= SEQUENCE
 	-- Location into which messages are temporarily stored. All asynchronous message services by
 	-- definition require some message store. E.g. in the case of e-mail this will be a mailbox
 {
-	validity		[1] TimeSpan OPTIONAL,
-	msgStoreID		[2] MsgStoreID OPTIONAL,
-	aliases			[3] SEQUENCE OF MsgAddress OPTIONAL,
+	validity			[1] TimeSpan OPTIONAL,
+	msgStoreID			[2] MsgStoreID OPTIONAL,
+	aliases				[3] SEQUENCE OF MsgAddress OPTIONAL,
 		-- The complete list of all addresses that get delivered into this message store.
-	providerID		[4] MsgProviderID OPTIONAL,
-	...
+	providerID			[4] MsgProviderID OPTIONAL,
+	...,
+	msgForwardingAddresses		[5] SEQUENCE OF MsgAddress OPTIONAL,
+	msgStoreSubscriberRelatedIDs	[6] SEQUENCE OF ContactDetails OPTIONAL
 }
 
 MsgStoreID ::= OCTET STRING
@@ -1687,7 +1707,8 @@ MultimediaRecord ::= CHOICE
 	multimediaSubscriber		[1] MultimediaSubscriber,
 	multimediaBillingDetails	[2] MultimediaBillingDetails,
 	multimediaServiceUsage		[3] MultimediaServiceUsage,
-	...
+	...,
+	multimediaDevice		[4] MultimediaDevice
 }
 
 -- ==============================
@@ -1763,10 +1784,14 @@ SubscribedMultimediaServices ::= SEQUENCE
 	deliveryAddress				[15] AddressInformation OPTIONAL,
 	resellerAddress				[16] AddressInformation OPTIONAL,
 	otherAddresses				[17] SEQUENCE OF OtherAddress OPTIONAL,
-	multimediaServiceType		[18] UTF8String OPTIONAL,
+	multimediaServiceType			[18] UTF8String OPTIONAL,
 		-- Service name used by the service provider which may be proprietary
-	orderTime					[19] GeneralizedTime OPTIONAL
-		-- Time when the subscribed service was ordered by the user
+	orderTime				[19] GeneralizedTime OPTIONAL,
+		-- Time when the subscribed service was ordered by the user	
+	iMEIs					[20] SEQUENCE OF IMEI OPTIONAL,
+	registeredICCIDs			[21] SEQUENCE OF ICCIDInfo OPTIONAL,
+	privateUserIdentities			[22] SEQUENCE OF IMPI OPTIONAL,
+	allocatedDeviceIDs			[23] SEQUENCE OF MultimediaDeviceID OPTIONAL
 }
 
 MultimediaServiceType ::= ENUMERATED
@@ -1779,6 +1804,9 @@ MultimediaServiceType ::= ENUMERATED
 	...
 }
 
+IMPI ::= UTF8String
+	-- Private User Identity of the IP Multimedia Subsystem subscription
+
 -- =================================
 -- Definitions of Service Usage Data
 -- =================================
@@ -1791,59 +1819,62 @@ MultimediaServiceUsage ::= SEQUENCE
 		-- provided by the party
 	communicationTime				[2] TimeSpan OPTIONAL,
 		-- Time and duration of the communication
-	reasonCause						[3] INTEGER OPTIONAL,
+	reasonCause					[3] INTEGER OPTIONAL,
 		-- cause code for call termination e.g. SIP Reason code
 	communicationType				[4] MultimediaCommunicationType OPTIONAL,
 	bearerService					[5] MultimediaBearerService OPTIONAL,
 	qualityOfService				[6] QualityOfService OPTIONAL,
 	ringDuration					[7] INTEGER OPTIONAL,
-	callID							[8] MultimediaCallID OPTIONAL,
+	callID						[8] MultimediaCallID OPTIONAL,
 	originalCallID					[9] MultimediaCallID OPTIONAL,
-	callState						[10] ENUMERATED
+	callState					[10] ENUMERATED
 	{
 		bNotReached(1),
 		bAlert(2),
 		bAnswered(3),
 		...
 	} OPTIONAL,
-	answerTime						[11] GeneralizedTime OPTIONAL,
-	contentType						[12] SEQUENCE OF UTF8String OPTIONAL,
+	answerTime					[11] GeneralizedTime OPTIONAL,
+	contentType					[12] SEQUENCE OF UTF8String OPTIONAL,
 	mediaComponents					[13] SEQUENCE OF MediaComponent OPTIONAL,
 	imsInformation					[14] ImsInformation OPTIONAL,
-	nationalMultimediaServiceUsage	[15] NationalMultimediaServiceUsage OPTIONAL,
-	serviceID						[16] UTF8String OPTIONAL,
-	providerID						[17] UTF8String OPTIONAL,
+	nationalMultimediaServiceUsage			[15] NationalMultimediaServiceUsage OPTIONAL,
+	serviceID					[16] UTF8String OPTIONAL,
+	providerID					[17] UTF8String OPTIONAL,
 	...,
-	cdrNumber						[18] UTF8String OPTIONAL, -- as per CSP defined format
-	clientIP						[19] IPAddress OPTIONAL,
-	relayIP							[20] IPAddress OPTIONAL,
-	vmLength						[21] INTEGER OPTIONAL, -- number of seconds
-	reason							[22] UTF8String OPTIONAL
+	cdrNumber					[18] UTF8String OPTIONAL, -- as per CSP defined format
+	clientIP					[19] IPAddress OPTIONAL,
+	relayIP						[20] IPAddress OPTIONAL,
+	vmLength					[21] INTEGER OPTIONAL, -- number of seconds
+	reason						[22] UTF8String OPTIONAL,
+	smsInformation					[23] SmsInformation OPTIONAL,
+	mmsInformation					[24] MmsInformation OPTIONAL
 }
 
 MultimediaPartyInformation ::= SEQUENCE
 {
-	partyRole							[1] MultimediaPartyRole OPTIONAL,
+	partyRole						[1] MultimediaPartyRole OPTIONAL,
 	partyIdentity						[2] PartyIdentity OPTIONAL,
 	subscriberID						[3] MultimediaSubscriberID OPTIONAL,
 	communicationTime					[4] TimeSpan OPTIONAL,
 		-- Time and duration of the communication
-	iMSI								[6] IMSI OPTIONAL,
+	iMSI							[6] IMSI OPTIONAL,
 	natureOfAddress						[7] UTF8String OPTIONAL,
 		-- Nature of address indicator, e.g. "National", "International"
-	uRI									[8] UTF8String OPTIONAL,
-	partyNumber							[9] PartyNumber OPTIONAL,
+	uRI							[8] UTF8String OPTIONAL,
+	partyNumber						[9] PartyNumber OPTIONAL,
 	naAssignedAddress					[10] NAAssignedAddress OPTIONAL,
-	forwardedTransferredIdentifier		[11] PartyIdentity OPTIONAL,
-	terminatingTransferredIdentifier	[12] PartyIdentity OPTIONAL,
-	nationalMultimediaPartyInformation	[13] NationalMultimediaPartyInformation OPTIONAL,
+	forwardedTransferredIdentifier				[11] PartyIdentity OPTIONAL,
+	terminatingTransferredIdentifier			[12] PartyIdentity OPTIONAL,
+	nationalMultimediaPartyInformation			[13] NationalMultimediaPartyInformation OPTIONAL,
 	...,
-	userAgent							[14] UTF8String OPTIONAL,
+	userAgent						[14] UTF8String OPTIONAL,
 		-- e.g. SIP User-Agent field (see RFC 3261 [26])
 	octetsUploaded						[15] INTEGER OPTIONAL,
 	octetsDownloaded					[16] INTEGER OPTIONAL,
-	accessNetworkInformation				[17] SEQUENCE OF AccessNetworkInfo OPTIONAL
-
+	accessNetworkInformation				[17] SEQUENCE OF AccessNetworkInfo OPTIONAL,
+	privateUserIdentity					[18] IMPI OPTIONAL,
+	iMEI							[19] IMEI OPTIONAL
 }
 
 MultimediaCallID	::=	UTF8String
@@ -1853,7 +1884,11 @@ MultimediaCommunicationType	::=	ENUMERATED
 	multimediaFixed(0),
 	multimediaWireless(1),
 	multimediaNetworkIndependent(2),
-	...
+	...,
+	telephonyFixed(3),
+	telephonyWireless(4),
+	sMS(5),
+	mMS(6)
 }
 
 MultimediaPartyRole	::=	ENUMERATED
@@ -1869,7 +1904,21 @@ MultimediaPartyRole	::=	ENUMERATED
 	broadcastReceiver(8),
 	broadcastSender(9),
 	...,
-	originalCalling(10)
+	originalCalling(10),
+	forwarded-to-Party(11),
+	connected(12),
+	userProvidedCalling(13),
+	roaming(14),
+	translated(15),
+	singlePersonalNumber(16),
+	smsOriginator(17),
+	smsRecipient(18),
+	smsOriginatorTrn(19),
+	smsRecipientTrn(20),
+	mmsOriginator(21),
+	mmsRecipient(22),
+	mmsOriginatorTrn(23),
+	mmsRecipientTrn(24)
 }
 
 MultimediaBearerService	::=	ENUMERATED
@@ -2059,6 +2108,42 @@ NationalMultimediaMediaComponent ::= SEQUENCE
 	...
 }
 
+-- =======================
+-- Device Data definitions
+-- =======================
+
+MultimediaDevice ::= SEQUENCE
+{
+	deviceIDType					[1] ENUMERATED
+		-- Type of identifier for telephony device
+	{
+		unknown(0),
+		imei(1),
+		macAddress(2),
+		...
+	} OPTIONAL,
+	multimediaDeviceID				[2] MultimediaDeviceID OPTIONAL,
+		-- Unique identifier for this device according to type of identifier
+	subscriberID					[3] MultimediaSubscriberID OPTIONAL,
+		-- Identifier for a known user of this equipment.
+		-- Usage of this parameter is subject to national legislation.
+	nationalMultimediaDevice		[4] NationalMultimediaDevice OPTIONAL,
+		-- To be defined on a national basis
+		-- Only to be used in case the present document cannot fulfil the national requirements
+	...
+}
+
+NationalMultimediaDevice ::= SEQUENCE
+{
+	countryCode		[1] UTF8String (SIZE (2)),
+		-- see comment in NationalRequestParameters
+	...
+}
+
+MultimediaDeviceID ::= OCTET STRING
+	-- A unique identifier for the multimedia device. For example, the IMEI number
+	-- of a mobile handset
+
 NetworkAccessRecord::= CHOICE
 {
 	naSubscriber		[1] NASubscriber,
@@ -2100,19 +2185,19 @@ NASubscriber ::= SEQUENCE
 NAServiceSubscription ::= SEQUENCE
 	-- Description of the subscription to a Network Access service
 {
-	validity				[1] TimeSpan OPTIONAL,
-	naServiceID				[2] UTF8String OPTIONAL,
+	validity			[1] TimeSpan OPTIONAL,
+	naServiceID			[2] UTF8String OPTIONAL,
 		-- Identifier for the service, e.g. account plan name.
 	naProviderID			[3] NAProviderID OPTIONAL,
 		-- Unique identifier for the provider of the service, e.g. company name
-	naAuthID				[4] NAAuthID OPTIONAL,
+	naAuthID			[4] NAAuthID OPTIONAL,
 		-- Unique identifier for this subscription, e.g. logon name
-	options					[5] UTF8String OPTIONAL,
+	options				[5] UTF8String OPTIONAL,
 		-- Human readable text with restrictions or options to the subscription
 	installationAddress		[6] AddressInformation OPTIONAL,
 	fixIpAddress			[7] IPAddress OPTIONAL,
 		-- fix assigned IP address
-	imsi					[8] IMSI OPTIONAL,
+	imsi				[8] IMSI OPTIONAL,
 	...,
 	allocatedDeviceIDs		[9] SEQUENCE OF NADeviceId OPTIONAL,
 	naServiceStatus			[10] UTF8String OPTIONAL,
@@ -2128,8 +2213,8 @@ NAServiceSubscription ::= SEQUENCE
 	otherAddresses			[18] SEQUENCE OF OtherAddress OPTIONAL,
 	allocatedDevices		[19] SEQUENCE OF NADevice OPTIONAL,
 		-- If present, contains device details for all elements from allocatedDeviceIDs
-	mSISDNs				[20] SEQUENCE OF PartyNumber OPTIONAL
-
+	mSISDNs				[20] SEQUENCE OF PartyNumber OPTIONAL,
+	registeredICCIDs		[21] SEQUENCE OF ICCIDInfo OPTIONAL
 }
 
 NationalNASubscription ::= SEQUENCE
diff --git a/102657/portal/RDMessagever19.xsd b/102657/portal/RDMessagever20.xsd
similarity index 95%
rename from 102657/portal/RDMessagever19.xsd
rename to 102657/portal/RDMessagever20.xsd
index f46fb92e70fcc5cc35e5a7cdb0219d66d322c3d6..19961bd0ec8b58f8eda59c751e4f0c2d0fc7013b 100644
--- a/102657/portal/RDMessagever19.xsd
+++ b/102657/portal/RDMessagever20.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.19.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.19.1#/RetainedData" elementFormDefault="qualified">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.22.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.22.1#/RetainedData" elementFormDefault="qualified">
     <xsd:annotation>
         <xsd:documentation xml:lang="en">
-            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.19.1
+            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.22.1
         </xsd:documentation>
     </xsd:annotation>
     <xsd:simpleType name="GeneralizedTime">
@@ -34,7 +34,7 @@
     <xsd:simpleType name="CountryCode">
         <xsd:annotation>
             <xsd:documentation xml:lang="en">
-                A country code as per ISO 3166-1 [xx]
+                A country code as per ISO 3166-1 [4]
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:string">
@@ -401,6 +401,7 @@
             <xsd:element name="countryCode" type="CountryCode"/>
             <xsd:element name="authorisedOrganisationID" type="AuthorisedOrganisationID"/>
             <xsd:element name="requestNumber" minOccurs="0" type="RequestNumber"/>
+            <xsd:element name="externalIdentifier" minOccurs="0" type="ExternalIdentifier"/>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -411,6 +412,7 @@
             <xsd:element name="timeStamp" type="GeneralizedTime"/>
             <xsd:element name="thirdPartyCSPID" minOccurs="0" type="CSPID"/>
             <xsd:element name="requestType" minOccurs="0" type="RequestType"/>
+            <xsd:element name="requestFlag" type="RequestFlag" minOccurs="0"/>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -514,6 +516,15 @@
         <xsd:sequence>
             <xsd:element name="authenticationType" minOccurs="0" type="xsd:string"/>
             <xsd:element name="authenticationNumber" minOccurs="0" type="xsd:string"/>
+            <xsd:element name="issuingCountry" minOccurs="0">
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                        <xsd:length value="2"/>
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:element>
+            <xsd:element name="issuingOrganization" minOccurs="0" type="xsd:string"/>
+            <xsd:element name="nationality" minOccurs="0" type="xsd:string"/>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -522,6 +533,7 @@
             <xsd:element name="billingMethod" minOccurs="0" type="BillingMethod"/>
             <xsd:element name="bankAccount" minOccurs="0" type="BankAccount"/>
             <xsd:element name="billingAddress" minOccurs="0" type="ContactDetails"/>
+            <xsd:element name="billingIdentifier" minOccurs="0" type="BillingIdentifier"/>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -595,6 +607,9 @@
         <xsd:sequence>
             <xsd:element name="iCCID" minOccurs="0" type="xsd:string"/>
             <xsd:element name="timeSpan" minOccurs="0" type="TimeSpan"/>
+            <xsd:element name="pUK" minOccurs="0" type="xsd:string"/>
+            <xsd:element name="pUK2" minOccurs="0" type="xsd:string"/>
+            <xsd:element name="iMSI" minOccurs="0" type="IMSI"/>
         </xsd:sequence>
     </xsd:complexType>
     <xsd:complexType name="LoginInfo">
@@ -1027,6 +1042,23 @@
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
+    <xsd:complexType name="MultimediaDevice">
+        <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="multimediaDeviceID" minOccurs="0" type="MultimediaDeviceID"/>
+            <xsd:element name="subscriberID" minOccurs="0" type="MultimediaSubscriberID"/>
+            <xsd:element name="nationalMultimediaDevice" minOccurs="0" type="NationalMultimediaDevice"/>
+            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
     <xsd:complexType name="NationalTelephonyDevice">
         <xsd:sequence>
             <xsd:element name="countryCode">
@@ -1341,6 +1373,13 @@
             </xsd:element>
             <xsd:element name="maritimeTransport" minOccurs="0" type="MaritimeTransport"/>
             <xsd:element name="airTransport" minOccurs="0" type="AirTransport"/>
+            <xsd:element name="bSSID" minOccurs="0">
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:hexBinary">
+                        <xsd:length value="6"/>
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:element>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -1507,6 +1546,20 @@
                 </xsd:complexType>
             </xsd:element>
             <xsd:element name="providerID" minOccurs="0" type="MsgProviderID"/>
+            <xsd:element name="msgForwardingAddresses" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="MsgAddress" type="MsgAddress"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="msgStoreSubscriberRelatedIDs" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="ContactDetails" type="ContactDetails"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -1745,6 +1798,13 @@
                     </xsd:sequence>
                 </xsd:complexType>
             </xsd:element>
+            <xsd:element name="registeredICCIDs" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="ICCIDInfo" type="ICCIDInfo"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -2313,6 +2373,7 @@
             <xsd:element name="multimediaSubscriber" type="MultimediaSubscriber"/>
             <xsd:element name="multimediaBillingDetails" type="MultimediaBillingDetails"/>
             <xsd:element name="multimediaServiceUsage" type="MultimediaServiceUsage"/>
+            <xsd:element name="multimediaDevice" type="MultimediaDevice"/>
             <xsd:any namespace="##other" processContents="lax"/>
         </xsd:choice>
     </xsd:complexType>
@@ -2392,6 +2453,34 @@
             </xsd:element>
             <xsd:element name="multimediaServiceType" minOccurs="0" type="xsd:string"/>
             <xsd:element name="orderTime" minOccurs="0" type="GeneralizedTime"/>
+            <xsd:element name="iMEIs" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="IMEI" type="IMEI"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="registeredICCIDs" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="ICCIDInfo" type="ICCIDInfo"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="privateUserIdentities" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence maxOccurs="unbounded">
+                        <xsd:element name="IMPI" type="IMPI"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="allocatedDeviceIDs" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                        <xsd:element name="MultimediaDeviceID" type="MultimediaDeviceID"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -2456,6 +2545,8 @@
             <xsd:element name="relayIP" minOccurs="0" type="IPAddress"/>
             <xsd:element name="vmLength" minOccurs="0" type="xsd:integer"/>
             <xsd:element name="reason" minOccurs="0" type="xsd:string"/>
+            <xsd:element name="smsInformation" minOccurs="0" type="SmsInformation"/>
+            <xsd:element name="mmsInformation" minOccurs="0" type="MmsInformation"/>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -2483,6 +2574,8 @@
                     </xsd:choice>
                 </xsd:complexType>
             </xsd:element>
+            <xsd:element name="privateUserIdentity" minOccurs="0" type="IMPI"/>
+            <xsd:element name="iMEI" minOccurs="0" type="IMEI"/>
             <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -2494,6 +2587,10 @@
             <xsd:element name="multimediaFixed" type="NULL"/>
             <xsd:element name="multimediaWireless" type="NULL"/>
             <xsd:element name="multimediaNetworkIndependent" type="NULL"/>
+            <xsd:element name="telephonyFixed" type="NULL"/>
+            <xsd:element name="telephonyWireless" type="NULL"/>
+            <xsd:element name="sMS" type="NULL"/>
+            <xsd:element name="mMS" type="NULL"/>
             <xsd:any namespace="##other" processContents="lax"/>
         </xsd:choice>
     </xsd:complexType>
@@ -2510,6 +2607,20 @@
             <xsd:element name="broadcastReceiver" type="NULL"/>
             <xsd:element name="broadcastSender" type="NULL"/>
             <xsd:element name="originalCalling" type="NULL"/>
+            <xsd:element name="forwarded-to-Party" type="NULL"/>
+            <xsd:element name="connected" type="NULL"/>
+            <xsd:element name="userProvidedCalling" type="NULL"/>
+            <xsd:element name="roaming" type="NULL"/>
+            <xsd:element name="translated" type="NULL"/>
+            <xsd:element name="singlePersonalNumber" type="NULL"/>
+            <xsd:element name="smsOriginator" type="NULL"/>
+            <xsd:element name="smsRecipient" type="NULL"/>
+            <xsd:element name="smsOriginatorTrn" type="NULL"/>
+            <xsd:element name="smsRecipientTrn" type="NULL"/>
+            <xsd:element name="mmsOriginator" type="NULL"/>
+            <xsd:element name="mmsRecipient" type="NULL"/>
+            <xsd:element name="mmsOriginatorTrn" type="NULL"/>
+            <xsd:element name="mmsRecipientTrn" type="NULL"/>
             <xsd:any namespace="##other" processContents="lax"/>
         </xsd:choice>
     </xsd:complexType>
@@ -2765,4 +2876,28 @@
             <xsd:any namespace="##other" processContents="lax"/>
         </xsd:choice>
     </xsd:complexType>
+    <xsd:simpleType name="MultimediaDeviceID">
+        <xsd:restriction base="xsd:hexBinary"/>
+    </xsd:simpleType>
+    <xsd:complexType name="NationalMultimediaDevice">
+        <xsd:sequence>
+            <xsd:element name="countryCode">
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                        <xsd:length value="2"/>
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:element>
+            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:simpleType name="ExternalIdentifier">
+        <xsd:restriction base="xsd:string"/>
+    </xsd:simpleType>
+    <xsd:simpleType name="IMPI">
+        <xsd:restriction base="xsd:string"/>
+    </xsd:simpleType>
+    <xsd:simpleType name="RequestFlag">
+        <xsd:restriction base="xsd:string"/>
+    </xsd:simpleType>
 </xsd:schema>