diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index d0d4c20476d933ae9ef1c2f345942a6ac70e7483..9fc0818216432330e686fce054b586f6696450b8 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) version13(13)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version14(14)}
 
 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) version13(13)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version14(14)}
 
 
 -- ======================================
@@ -106,7 +106,12 @@ RequestMessage ::= SEQUENCE
 		-- To be defined on a national basis 
 		-- Only to be used in case the present document cannot fulfil the national requirements
 		-- or to transmit a warrant.
-	...
+	...,
+	maxRecordsPerBatch			[6] INTEGER OPTIONAL
+		-- Indicates that multi-part delivery shall be used and each ResponseMessage shall not
+		-- contain more records than specified. (see clause 6.3.3.3)
+
+
 }
 
 DeliveryPointHIB ::= UTF8String
@@ -377,7 +382,28 @@ OrganizationInfo ::= SEQUENCE
 		-- address, and name/phone number of a point of contact
 	nationalRegistrationID	[3] UTF8String OPTIONAL,
 		-- e.g. social security number
-	...
+	...,
+	registeredAddress		[4] AddressInformation OPTIONAL,
+	tradingAddress			[5] AddressInformation OPTIONAL,
+	otherAddresses			[6] SEQUENCE OF OtherAddress OPTIONAL,
+	groupID					[7] UTF8String OPTIONAL,
+		-- identity of organization group
+	groupAdministrator		[8] UTF8String OPTIONAL,
+		-- identity of organization administrator
+	companyType				[9] UTF8String OPTIONAL,
+		-- type of company
+	vatEnabled				[10] BOOLEAN OPTIONAL,
+		-- VAT enabled or not
+	vatNumber				[11] UTF8String OPTIONAL,
+		-- VAT number
+	createIP				[12] IPAddress OPTIONAL,
+		-- IP used to create the subscriber account
+	createTime				[13] GeneralizedTime OPTIONAL,
+		-- time that subscriber account was created
+	modifiedDate			[14] GeneralizedTime OPTIONAL
+		-- date that subscriber account was modified
+
+
 }
 
 IndividualInfo ::= SEQUENCE
@@ -394,7 +420,11 @@ IndividualInfo ::= SEQUENCE
 	identificationNumber	[5] UTF8String OPTIONAL,
 	authenticationInfo		[6] AuthenticationInfo OPTIONAL,
 	...,
-	profession				[7] UTF8String OPTIONAL
+	profession				[7] UTF8String OPTIONAL,
+	otherAddresses			[8] SEQUENCE OF OtherAddress OPTIONAL,
+	createTime				[9] GeneralizedTime OPTIONAL
+		-- time that subscriber account was created
+
 }
 
 PersonName ::= SEQUENCE
@@ -449,6 +479,18 @@ AddressInformation ::= SEQUENCE
 	...
 }
 
+
+OtherAddress ::= SEQUENCE
+{
+	address			[1] AddressInformation OPTIONAL,
+	addressType		[2] UTF8String OPTIONAL,
+		-- Description of the type of address that has been given in the address field
+	addressComments	[3] UTF8String OPTIONAL,
+		-- Any extra information to aid the understanding of the address given
+	...
+}
+
+
 AuthenticationInfo ::= SEQUENCE
 {
 	authenticationType		[1] UTF8String OPTIONAL,
@@ -567,8 +609,11 @@ SubscribedTelephonyServices ::= SEQUENCE
 		-- To be defined on a national basis 
 		-- Only to be used in case the present document cannot fulfil the national requirements
 	paymentDetails						[17] PaymentDetails OPTIONAL,
-	subscriptionType					[18] SubscriptionType OPTIONAL  
+	subscriptionType					[18] SubscriptionType OPTIONAL,  
 		-- Describes the nature of the subscription
+	deliveryAddress						[19] AddressInformation OPTIONAL,
+	resellerAddress						[20] AddressInformation OPTIONAL,
+	otherAddresses						[21] SEQUENCE OF OtherAddress OPTIONAL
 
 }
 
@@ -1082,9 +1127,17 @@ TransmitterDetails ::= SEQUENCE
 
 TransmitterTechnology	::= ENUMERATED
 {
-	gen2G(0),
-	gen3G(1),
-	...
+	gen2G(0),		-- This corresponds to GERAN in 3GPP TS 29.274 [32]
+	gen3G(1),		-- This corresponds to UTRAN in 3GPP TS 29.274 [32]
+	...,
+	eUTRAN(2),
+	wLAN(3),
+	hSPAEvolution(4),
+	gAN(5),
+	vIRTUAL(6)
+	-- Note that the labels are taken from 3GPP TS 29.274 [32] v12.3.0 clause 8.17, though the
+	-- enumeration values (0 to 6) are not.
+
 }
 
 NationalTransmitterDetails	::= SEQUENCE
@@ -1124,8 +1177,15 @@ Location ::= SEQUENCE
 	...,
 	postalLocation		[8] AddressInformation OPTIONAL,
 	extendedLocation	[9] ExtendedLocation OPTIONAL,
-	userLocationInformation	[10] OCTET STRING (SIZE(1..35)) OPTIONAL
+	userLocationInformation	[10] OCTET STRING (SIZE(1..35)) OPTIONAL,
 		-- coded according to 3GPP TS 29.274 [32]; the type IE is not included
+	tAI			[11] OCTET STRING (SIZE (6)) OPTIONAL,
+		-- Only applicable to the CS traffic cases, such as SMS over SGs, according to 
+		-- 3GPP TS 23.272 [35]
+	eCGI			[12] OCTET STRING (SIZE (8)) OPTIONAL
+		-- Only applicable to the CS traffic cases, such as SMS over SGs, according to 
+		-- 3GPP TS 23.272 [35]
+
 }
 
 GSMLocation ::= CHOICE
@@ -1545,7 +1605,9 @@ MultimediaSubscriber ::= SEQUENCE
 		-- service-specific information about this subscriber
 	subscribedMultimediaServices	[4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL,
 		-- a subscriber (or account) may have more than one service listed against them
-	...
+	...,
+	multimediaServiceRegistrationInfo [5] MultimediaServiceRegistrationInfo OPTIONAL
+
 }
 
 MultimediaSubscriberInfo ::= SEQUENCE
@@ -1557,6 +1619,25 @@ MultimediaSubscriberInfo ::= SEQUENCE
 MultimediaSubscriberID ::= UTF8String
 	-- unique identifier for this subscriber, e.g. account number
 
+
+MultimediaServiceRegistrationInfo ::= SEQUENCE
+{
+	emailAddress				[1] UTF8String OPTIONAL, 
+	-- subscriber email address in RFC2822 format
+	languageAtRegistration		[2] UTF8String OPTIONAL, 
+	-- subscriber language as in ISO 639
+	accountCreationTime			[3] GeneralizedTime OPTIONAL, -- start time of account
+	accountCreationIP			[4] IPAddress OPTIONAL, -- subscriber IP at creation
+	accountCreationCountry 		[5] UTF8String (SIZE (2)) OPTIONAL, 
+	-- subscriber country as specified in ISO 3166-2
+	clientPlatformType			[6] UTF8String OPTIONAL, -- subscriber platform
+	clientVersion				[7] UTF8String OPTIONAL, -- subscriber platform version
+	...
+}
+
+
+
+
 SubscribedMultimediaServices ::= SEQUENCE
 {
 	serviceID					[1] UTF8String OPTIONAL,
@@ -1583,8 +1664,16 @@ SubscribedMultimediaServices ::= SEQUENCE
 		-- national extension
 	...,
 	paymentDetails				[13] PaymentDetails OPTIONAL,
-	subscriptionType			[14] SubscriptionType OPTIONAL  
+	subscriptionType			[14] SubscriptionType OPTIONAL,  
 		-- Describes the nature of the subscription
+	deliveryAddress				[15] AddressInformation OPTIONAL,
+	resellerAddress				[16] AddressInformation OPTIONAL,
+	otherAddresses				[17] SEQUENCE OF OtherAddress 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
+
 
 }
 
@@ -1632,7 +1721,14 @@ MultimediaServiceUsage ::= SEQUENCE
 	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
+
+
 }
 
 MultimediaPartyInformation ::= SEQUENCE
@@ -1680,7 +1776,8 @@ MultimediaPartyRole	::=	ENUMERATED
 	directory(7),
 	broadcastReceiver(8),
 	broadcastSender(9),
-	...
+	...,
+	originalCalling (10)
 }
 
 MultimediaBearerService	::=	ENUMERATED
@@ -1748,9 +1845,20 @@ MultimediaBillingDetails ::= SEQUENCE
 	nationalMultimediaBillingDetails	[6] NationalMultimediaBillingDetails OPTIONAL,
 		-- To be defined on a national basis 
 		-- Only to be used in case the present document cannot fulfil the national requirements
+	...,
+	multimediaBillingAddress			[7] MultimediaBillingAddress OPTIONAL
+
+}
+
+MultimediaBillingAddress ::= SEQUENCE
+{
+	addressSuppliedTime			[1] GeneralizedTime OPTIONAL,
+	name						[2] PersonName OPTIONAL,
+	address						[3] AddressInformation  OPTIONAL,
 	...
 }
 
+
 NationalMultimediaBillingDetails ::= SEQUENCE
 {
 	countryCode		[1] UTF8String (SIZE (2)),
@@ -1895,8 +2003,13 @@ NAServiceSubscription ::= SEQUENCE
 	nationalNASubscription	[12] NationalNASubscription OPTIONAL,
 	paymentDetails			[13] PaymentDetails OPTIONAL,
 	additionalIPAddresses	[14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL,
-	subscriptionType		[15] SubscriptionType OPTIONAL  
+	subscriptionType		[15] SubscriptionType OPTIONAL,
 		-- Describes the nature of the subscription
+	deliveryAddress			[16] AddressInformation OPTIONAL,
+	resellerAddress			[17] AddressInformation OPTIONAL,
+	otherAddresses			[18] SEQUENCE OF OtherAddress OPTIONAL
+
+
 }
 
 NationalNASubscription ::= SEQUENCE
@@ -1950,7 +2063,135 @@ NAServiceUsage ::= SEQUENCE
 	subscriberID		[15] NaSubscriberID OPTIONAL,
 		-- Identifier for a known user of this network access
 	ePSInformation		[16] EPSInformation OPTIONAL,
-	wifiInformation		[17] WifiInformation OPTIONAL
+	wifiInformation		[17] WifiInformation OPTIONAL,
+	addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL
+	-- contains extended information about the NAT or PAT operations carried out within this
+	-- service usage session
+
+
+}
+
+
+
+WifiInformation ::= SEQUENCE
+{
+	bSSID					[1] OCTET STRING (SIZE (6)) OPTIONAL,
+		-- The Basic Service Set Identification for the connection.
+		-- This is also the MAC address of the access point (the present document assumes 
+		-- that records are for infrastructure mode, not ad-hoc mode).
+		-- The MAC address of the user is given in the naDeviceID in the structure (one level up) 
+	sSID					[2] UTF8String OPTIONAL,
+		-- The human-readable Service Set Identifier
+		-- It should be noted that this is typically only available on the air interface and so 
+		-- is not likely to be logged by CSPs (though may be recorded at a more local level).
+		-- Therefore requesting organizations should not expect this to be populated typically.
+		-- It is not guaranteed to be unique.
+	username				[3] UTF8String OPTIONAL,
+	locationOfAccessPoint	[4] Location OPTIONAL, 
+		-- Location of the Access Point as lat/long, grid reference or postal address.
+		-- Requesting organizations should be aware that Access Points can be moved, sometimes
+		-- without the knowledge of the CSP
+	authenticationType 			[5] AuthenticationType OPTIONAL,
+	additionalAuthenticationInformation 	[6] AdditionalAuthenticationInformation OPTIONAL,
+	...,
+
+	accessPointIPAddress			 [7] IPAddress  OPTIONAL,
+	accessPointAdditionalDescriptions[8] SEQUENCE OF UTF8String OPTIONAL,
+			-- Informal description of location, category or type of access point, 
+			-- or a name of the network to which the access point belongs.
+	accessPointAdditionalProviders   [9] SEQUENCE OF UTF8String OPTIONAL
+			-- For WiFi, there may be other parties involved in hosting or owning the
+			-- Access Points, e.g. access point provider or partner providers
+
+}
+
+
+AuthenticationType ::= ENUMERATED
+{
+	authenticationBySMS (1),
+	    -- Used if authentication arranged through a code sent to mobile
+		-- additionalAuthenticationInformation shall contain the phone number
+	authenticationByCookie  (2),
+	    -- If authentication was granted on the basis of a cookie left from a previous visit to a 
+		-- site.
+		-- No other mandatory addtionalAuthenticationInformation
+	authenticationByMACAddress	(3),
+		-- If authentication was granted because the MAC address of the UE was recognised due
+		-- to a previous visit. 
+		-- additionalAuthenticationInformation shall contain the MAC Address unless it is already 
+		-- populated as NADeviceID in this record.
+	authenticationByEAPSIM (4),	
+		-- If authenticated by EAP SIM see TS 33.234 [X]
+		-- additionalAuthenticationInformation shall contain the IMSI
+	-- Other varieties of EAP could be added here later, together with any extra information they 
+	-- could provide.
+	authenticationByUsernameAndPassword (5),
+		-- additionalAuthenticationInformation should contain username and password if appropriate
+	authenticationByPaymentOrVoucher (6),
+		-- additionalAuthenticationInformation should contain Voucher or Payment details 
+		-- if appropriate. 
+	...
+}
+
+AdditionalAuthenticationInformation ::= SEQUENCE
+{
+	phoneNumber  		[1] PartyNumber OPTIONAL,
+	    -- e.g. number to which an SMS was sent
+	mACAddress			[2] OCTET STRING (SIZE (6)) OPTIONAL,
+	iMSI				[3] IMSI OPTIONAL,
+	username			[4] UTF8String OPTIONAL, 
+			-- Names supplied are unlikely to be verified
+	password			[5] UTF8String OPTIONAL,
+			-- Only to be populated if it is both appropriate and available
+	paymentReference	[6] UTF8String OPTIONAL,
+		-- For example, the number of a voucher that was used in authentication
+	...
+}
+
+
+
+AddressTranslationRecord ::= SEQUENCE
+{
+	validity 							[1] TimeSpan OPTIONAL,
+		-- time at which the address translation started and/or ended
+	privateIPAddress 					[2] IPAddress OPTIONAL,
+		-- the private IP of the host
+	privatePort 						[3] INTEGER OPTIONAL,
+		-- the private port of the host
+	publicIPAddress						[4] IPAddress OPTIONAL,
+		-- the translated IP of the host, i.e. the address known by the remote host 
+	publicPort							[5] AddressTranslationPortAssignment OPTIONAL,
+		-- the translated port(s) of the host, i.e. the port(s) known by the remote host, if 		   		   applicable
+	destinationIPAddress				[6] IPAddress OPTIONAL,
+		-- the IP address of the remote host
+	destinationPort						[7] INTEGER OPTIONAL,
+		-- the port of the remote host
+	connectionType						[8] ENUMERATED
+	{
+		udp (0),
+		tcp (1),
+		sctp (2),
+		other (3),
+		...
+	} OPTIONAL,
+	...
+}
+
+AddressTranslationPortAssignment ::= CHOICE
+{
+	singlePort						[1] INTEGER,
+		-- only one port is assigned to the host, that port number is specified here
+	portRange						[2] SEQUENCE OF PortRange,
+		-- if a range of translated ports is assigned to the host, specify it here
+	...
+}
+
+PortRange ::= SEQUENCE
+{
+	-- The range given is inclusive of both ends
+	lowerBound		[1] INTEGER OPTIONAL,
+	upperBound		[2] INTEGER OPTIONAL,
+	...
 }
 
 NAEndReason ::= ENUMERATED
@@ -2080,7 +2321,7 @@ EPSEvent ::= ENUMERATED
 -- The list of “EPSEvent” below is partly taken from 3GPP TS 33.108
 -- EpsHI2Operations from the “EPSEvent ::=ENUMERATED” module
 {
-    e-UTRANAttach					 				   (16),
+    e-UTRANAttach			    (16),
     e-UTRANDetach                           (17),
     bearerActivation                        (18),
     bearerModification                      (20),
@@ -2090,45 +2331,6 @@ EPSEvent ::= ENUMERATED
 	...
 }
 
-
-WifiInformation ::= SEQUENCE
-{
-	bSSID					[1] OCTET STRING (SIZE (6)) OPTIONAL,
-		-- The Basic Service Set Identification for the connection.
-		-- This is also the MAC address of the access point (the present document assumes 
-		-- that records are for infrastructure mode, not ad-hoc mode).
-		-- The MAC address of the user is given in the naDeviceID in the structure (one level up) 
-	sSID					[2] UTF8String OPTIONAL,
-		-- The human-readable Service Set Identifier
-	username				[3] UTF8String OPTIONAL,
-	protocol				[4] ENUMERATED
-	{
-		iEEE80211 (1),
-		iEEE80211a (2),
-		iEEE80211b (3),
-		iEEE80211g (4),
-		iEEE80211n (5),
-		iEEE80211ac (6),
-		iEEE80211ad (7),
-		...
-	} OPTIONAL,
-	securityMode			[5] ENUMERATED
-	{
-		wEP (0),
-		wPA (1),
-		wPA2 (2),
-		...
-	} OPTIONAL,
-	authenticationTelephoneNumber    [6] PartyNumber OPTIONAL,
-	    -- if authentication arranged through a code sent to mobile, this is the number 
-		-- to which the code was sent
-	authenticationPaymentReference	 [7] UTF8String OPTIONAL,
-		-- For example, the number of a voucher that was used in authentication
-	...
-}
-
-
-
 -- ====================================
 -- Definitions of Network Access Device
 -- ====================================
diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index 32636be18bdc97254285885164042df28ea8b4be..a67efde8c0ae0960708b460f5b899d160e34d6fa 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://uri.etsi.org/02657/v1.13.1#/RetainedData"
-            targetNamespace="http://uri.etsi.org/02657/v1.13.1#/RetainedData"
+            xmlns="http://uri.etsi.org/02657/v1.14.1#/RetainedData"
+            targetNamespace="http://uri.etsi.org/02657/v1.14.1#/RetainedData"
 			elementFormDefault="qualified">
 
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.13.1 
+			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.14.1 
 		</xsd:documentation>
 	</xsd:annotation>
 
@@ -495,7 +495,16 @@
       </xsd:sequence>
    </xsd:complexType>
 
-   <xsd:complexType name="ContactDetails">
+  <xsd:complexType name="OtherAddress">
+    <xsd:sequence>
+      <xsd:element name="address" minOccurs="0" type="AddressInformation"/>
+      <xsd:element name="addressType" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="addressComments" minOccurs="0" type="xsd:string"/>
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="ContactDetails">
       <xsd:sequence>
          <xsd:element name="address" minOccurs="0" type="AddressInformation"/>
          <xsd:element name="emailAddress" minOccurs="0" type="xsd:string"/>
@@ -522,6 +531,23 @@
          <xsd:element name="name" minOccurs="0" type="xsd:string"/>
          <xsd:element name="contactDetails" minOccurs="0" type="ContactDetails"/>
          <xsd:element name="nationalRegistrationID" minOccurs="0" type="xsd:string"/>
+         <xsd:element name="registeredAddress" minOccurs="0" type="AddressInformation"/>
+         <xsd:element name="tradingAddress" minOccurs="0" type="AddressInformation"/>
+         <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="groupID" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="groupAdministrator" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="companyType" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="vatEnabled" minOccurs="0" type="xsd:boolean"/>
+        <xsd:element name="vatNumber" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="createIP" minOccurs="0" type="IPAddress"/>
+        <xsd:element name="createTime" minOccurs="0" type="GeneralizedTime"/>
+        <xsd:element name="modifiedDate" minOccurs="0" type="GeneralizedTime"/>   
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -602,7 +628,15 @@
          <xsd:element name="identificationNumber" minOccurs="0" type="xsd:string"/>
          <xsd:element name="authenticationInfo" minOccurs="0" type="AuthenticationInfo"/>
 		 <xsd:element name="profession" minOccurs="0" type="xsd:string"/>
-         <xsd:any namespace="##other" processContents="lax" 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="createTime" minOccurs="0" type="GeneralizedTime"/>
+        <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
 
@@ -646,6 +680,15 @@
 		 <xsd:element name="nationalTelephonySubscriptionInfo" minOccurs="0" type="NationalTelephonySubscriptionInfo"/>
 		 <xsd:element name="paymentDetails" minOccurs="0" type="PaymentDetails"/>
      <xsd:element name="subscriptionType" minOccurs="0" type="SubscriptionType"/>
+     <xsd:element name="deliveryAddress" minOccurs="0" type="AddressInformation"/>
+     <xsd:element name="resellerAddress" minOccurs="0" type="AddressInformation"/>
+     <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:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -1330,6 +1373,20 @@
                </xsd:restriction>
             </xsd:simpleType>
 		 </xsd:element>
+        <xsd:element name="tAI" minOccurs="0">
+          <xsd:simpleType>
+            <xsd:restriction base="xsd:hexBinary">
+              <xsd:length value="6"/>
+            </xsd:restriction>
+          </xsd:simpleType>
+        </xsd:element>
+        <xsd:element name="eCGI" minOccurs="0">
+          <xsd:simpleType>
+            <xsd:restriction base="xsd:hexBinary">
+              <xsd:length value="8"/>
+            </xsd:restriction>
+          </xsd:simpleType>
+        </xsd:element>
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -1417,6 +1474,11 @@
       <xsd:choice>
          <xsd:element name="gen2G" type="NULL"/>
          <xsd:element name="gen3G" type="NULL"/>
+        <xsd:element name="eUTRAN" type="NULL"/>
+        <xsd:element name="wLAN" type="NULL"/>
+        <xsd:element name="hSPAEvolution" type="NULL"/>
+        <xsd:element name="gAN" type="NULL"/>
+        <xsd:element name="vIRTUAL" type="NULL"/>
          <xsd:any namespace="##other" processContents="lax"/>
       </xsd:choice>
    </xsd:complexType>
@@ -1697,6 +1759,15 @@
             </xsd:complexType>
          </xsd:element>
         <xsd:element name="subscriptionType" minOccurs="0" type="SubscriptionType"/>
+        <xsd:element name="deliveryAddress" minOccurs="0" type="AddressInformation"/>
+        <xsd:element name="resellerAddress" minOccurs="0" type="AddressInformation"/>
+        <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:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -1838,6 +1909,13 @@
          <xsd:element name="subscriberID" minOccurs="0" type="NaSubscriberID"/>
 		 <xsd:element name="ePSInformation" minOccurs="0" type="EPSInformation"/>
         <xsd:element name="wifiInformation" minOccurs="0" type="WifiInformation"/>
+        <xsd:element name="addressTranslationRecords" minOccurs="0">
+          <xsd:complexType>
+            <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+              <xsd:element name="AddressTranslationRecord" type="AddressTranslationRecord"/>
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>        
 		 <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -1851,39 +1929,95 @@
           </xsd:restriction>
         </xsd:simpleType>
       </xsd:element>
-      <xsd:element name="sSID" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="sSID" minOccurs="0" type="xsd:string"/>      
       <xsd:element name="username" minOccurs="0" type="xsd:string"/>
-      <xsd:element name="protocol" minOccurs="0">
+      <xsd:element name="locationOfAccessPoint" minOccurs="0" type="Location"/>
+      <xsd:element name="authenticationType" minOccurs="0" type="AuthenticationType"/>
+      <xsd:element name="additionalAuthenticationInformation" minOccurs="0" type="AdditionalAuthenticationInformation"/>
+      <xsd:element name="accessPointIPAddress" minOccurs="0" type="IPAddress"/>
+      <xsd:element name="accessPointAdditionalDescriptions" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="accessPointAdditionalProviders" minOccurs="0" type="xsd:string"/>
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  
+  <xsd:complexType name="AuthenticationType">
+    <xsd:choice>
+      <xsd:element name="authenticationBySMS" type="NULL"/>
+      <xsd:element name="authenticationByCookie" type="NULL"/>
+      <xsd:element name="authenticationByMACAddress" type="NULL"/>
+      <xsd:element name="authenticationByEAPSIM" type="NULL"/>
+      <xsd:element name="authenticationByUsernameAndPassword" type="NULL"/>
+      <xsd:element name="authenticationByPaymentOrVoucher" type="NULL"/>      
+      <xsd:any namespace="##other" processContents="lax"/>
+    </xsd:choice>
+  </xsd:complexType>
+  
+  <xsd:complexType name="AdditionalAuthenticationInformation">
+    <xsd:sequence>
+      <xsd:element name="phoneNumber" minOccurs="0" type="PartyNumber"/>
+      <xsd:element name="mACAddress" minOccurs="0">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:hexBinary">
+            <xsd:length value="6"/>
+          </xsd:restriction>
+        </xsd:simpleType>
+      </xsd:element>
+      <xsd:element name="iMSI" minOccurs="0" type="IMSI"/>
+      <xsd:element name="username" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="password" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="paymentReference" minOccurs="0" type="xsd:string"/>
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="AddressTranslationRecord">
+    <xsd:sequence>
+      <xsd:element name="validity" minOccurs="0" type="TimeSpan"/>
+      <xsd:element name="privateIPAddress" minOccurs="0" type="IPAddress"/>
+      <xsd:element name="privatePort" minOccurs="0" type="xsd:integer"/>
+      <xsd:element name="publicIPAddress" minOccurs="0" type="IPAddress"/>
+      <xsd:element name="publicPort" minOccurs="0" type="AddressTranslationPortAssignment"/>
+      <xsd:element name="destinationIPAddress" minOccurs="0" type="IPAddress"/>
+      <xsd:element name="destinationPort" minOccurs="0" type="xsd:integer"/>
+      <xsd:element name="connectionType" minOccurs="0">
         <xsd:complexType>
           <xsd:choice>
-            <xsd:element name="iEEE80211" type="NULL"/>
-            <xsd:element name="iEEE80211a" type="NULL"/>
-            <xsd:element name="iEEE80211b" type="NULL"/>
-            <xsd:element name="iEEE80211g" type="NULL"/>            
-            <xsd:element name="iEEE80211n" type="NULL"/>
-            <xsd:element name="iEEE80211ac" type="NULL"/>
-            <xsd:element name="iEEE80211ad" type="NULL"/>
+            <xsd:element name="udp" type="NULL"/>
+            <xsd:element name="tcp" type="NULL"/>
+            <xsd:element name="sctp" type="NULL"/>
+            <xsd:element name="other" type="NULL"/>
             <xsd:any namespace="##other" processContents="lax"/>
           </xsd:choice>
         </xsd:complexType>
       </xsd:element>
-      <xsd:element name="securityMode" minOccurs="0">
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="AddressTranslationPortAssignment">
+    <xsd:choice>
+      <xsd:element name="singlePort" minOccurs="0" type="xsd:integer"/>
+      <xsd:element name="portRange" minOccurs="0">
         <xsd:complexType>
-          <xsd:choice>
-            <xsd:element name="wEP" type="NULL"/>
-            <xsd:element name="wPA" type="NULL"/>
-            <xsd:element name="wPA2" type="NULL"/>
-            <xsd:any namespace="##other" processContents="lax"/>
-          </xsd:choice>
+          <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="PortRange" type="PortRange"/>
+          </xsd:sequence>
         </xsd:complexType>
       </xsd:element>
-      <xsd:element name="authenticationTelephoneNumber" minOccurs="0" type="PartyNumber"/>
-      <xsd:element name="authenticationPaymentReference" minOccurs="0" type="xsd:string"/>
+      <xsd:any namespace="##other" processContents="lax"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="PortRange">
+    <xsd:sequence>
+      <xsd:element name="lowerBound" minOccurs="0" type="xsd:integer"/>      
+      <xsd:element name="upperBound" minOccurs="0" type="xsd:integer"/>
       <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
     </xsd:sequence>
   </xsd:complexType>
-  
-   <xsd:complexType name="EPSInformation">
+
+  <xsd:complexType name="EPSInformation">
       <xsd:sequence>
          <xsd:element name="iMSI" minOccurs="0" type="IMSI"/>
          <xsd:element name="iMSIUnauthenticatedFlag" minOccurs="0" type="IMSIUnauthenticatedFlag"/>
@@ -2068,8 +2202,9 @@
          <xsd:element name="requestPriority" minOccurs="0" type="RequestPriority"/>
          <xsd:element name="requestParameters" minOccurs="0" type="RequestConstraints"/>
          <xsd:element name="deliveryPointHIB" minOccurs="0" type="DeliveryPointHIB"/>
-		 <xsd:element name="maxHits" minOccurs="0" type="xsd:integer"/>
+		     <xsd:element name="maxHits" minOccurs="0" type="xsd:integer"/>
          <xsd:element name="nationalRequestParameters" minOccurs="0" type="NationalRequestParameters"/>
+         <xsd:element name="maxRecordsPerBatch" minOccurs="0" type="xsd:integer"/>        
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -2221,6 +2356,7 @@
                </xsd:sequence>
             </xsd:complexType>
 		 </xsd:element>
+        <xsd:element name="multimediaServiceRegistrationInfo" minOccurs="0" type="MultimediaServiceRegistrationInfo"/>
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -2235,8 +2371,27 @@
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
-   
-   <xsd:complexType name="SubscribedMultimediaServices">
+  
+  <xsd:complexType name="MultimediaServiceRegistrationInfo">
+    <xsd:sequence>
+      <xsd:element name="emailAddress" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="languageAtRegistration" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="accountCreationTime" minOccurs="0" type="GeneralizedTime"/>
+      <xsd:element name="accountCreationIP" minOccurs="0" type="IPAddress"/>
+      <xsd:element name="accountCreationCountry" minOccurs="0">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:string">
+            <xsd:length value="2"/>
+          </xsd:restriction>
+        </xsd:simpleType>
+      </xsd:element>
+      <xsd:element name="clientPlatformType" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="clientVersion" minOccurs="0" type="xsd:string"/>
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="SubscribedMultimediaServices">
       <xsd:sequence>
          <xsd:element name="serviceID" minOccurs="0" type="xsd:string"/>
          <xsd:element name="providerID" minOccurs="0" type="xsd:string"/>
@@ -2258,7 +2413,18 @@
          <xsd:element name="nationalMultimediaServices" minOccurs="0" type="NationalMultimediaServices"/>
 		 <xsd:element name="paymentDetails" minOccurs="0" type="PaymentDetails"/>
         <xsd:element name="subscriptionType" minOccurs="0" type="SubscriptionType"/>
-         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+        <xsd:element name="deliveryAddress" minOccurs="0" type="AddressInformation"/>
+        <xsd:element name="resellerAddress" minOccurs="0" type="AddressInformation"/>
+        <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="multimediaServiceType" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="orderTime" minOccurs="0" type="GeneralizedTime"/>
+        <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
    
@@ -2318,8 +2484,13 @@
          <xsd:element name="imsInformation" minOccurs="0" type="ImsInformation"/>		 
          <xsd:element name="nationalMultimediaServiceUsage" minOccurs="0" type="NationalMultimediaServiceUsage"/>		 
          <xsd:element name="serviceID" minOccurs="0" type="xsd:string"/>		 
-         <xsd:element name="providerID" minOccurs="0" type="xsd:string"/>		 
-         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+         <xsd:element name="providerID" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="cdrNumber" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="clientIP" minOccurs="0" type="IPAddress"/>
+        <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:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
 
@@ -2369,6 +2540,7 @@
          <xsd:element name="directory" type="NULL"/>
          <xsd:element name="broadcastReceiver" type="NULL"/>
          <xsd:element name="broadcastSender" type="NULL"/>
+        <xsd:element name="originalCalling" type="NULL"/>
          <xsd:any namespace="##other" processContents="lax"/>
       </xsd:choice>
    </xsd:complexType>
@@ -2452,11 +2624,21 @@
             </xsd:complexType>
 		 </xsd:element>
          <xsd:element name="nationalMultimediaBillingDetails" minOccurs="0" type="NationalMultimediaBillingDetails"/>
+        <xsd:element name="multimediaBillingAddress" minOccurs="0" type="MultimediaBillingAddress"/>
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
 
-   <xsd:complexType name="NationalMultimediaBillingDetails">
+  <xsd:complexType name="MultimediaBillingAddress">
+    <xsd:sequence>
+      <xsd:element name="addressSuppliedTime" minOccurs="0" type="GeneralizedTime"/>
+      <xsd:element name="name" minOccurs="0" type="PersonName"/>
+      <xsd:element name="address" minOccurs="0" type="AddressInformation"/>
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  
+  <xsd:complexType name="NationalMultimediaBillingDetails">
       <xsd:sequence>
          <xsd:element name="countryCode">
             <xsd:simpleType>
diff --git a/102657/portal/RDMessage,ver13.xsd b/102657/portal/RDMessage,ver14.xsd
similarity index 91%
rename from 102657/portal/RDMessage,ver13.xsd
rename to 102657/portal/RDMessage,ver14.xsd
index 32636be18bdc97254285885164042df28ea8b4be..a67efde8c0ae0960708b460f5b899d160e34d6fa 100644
--- a/102657/portal/RDMessage,ver13.xsd
+++ b/102657/portal/RDMessage,ver14.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://uri.etsi.org/02657/v1.13.1#/RetainedData"
-            targetNamespace="http://uri.etsi.org/02657/v1.13.1#/RetainedData"
+            xmlns="http://uri.etsi.org/02657/v1.14.1#/RetainedData"
+            targetNamespace="http://uri.etsi.org/02657/v1.14.1#/RetainedData"
 			elementFormDefault="qualified">
 
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.13.1 
+			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.14.1 
 		</xsd:documentation>
 	</xsd:annotation>
 
@@ -495,7 +495,16 @@
       </xsd:sequence>
    </xsd:complexType>
 
-   <xsd:complexType name="ContactDetails">
+  <xsd:complexType name="OtherAddress">
+    <xsd:sequence>
+      <xsd:element name="address" minOccurs="0" type="AddressInformation"/>
+      <xsd:element name="addressType" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="addressComments" minOccurs="0" type="xsd:string"/>
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="ContactDetails">
       <xsd:sequence>
          <xsd:element name="address" minOccurs="0" type="AddressInformation"/>
          <xsd:element name="emailAddress" minOccurs="0" type="xsd:string"/>
@@ -522,6 +531,23 @@
          <xsd:element name="name" minOccurs="0" type="xsd:string"/>
          <xsd:element name="contactDetails" minOccurs="0" type="ContactDetails"/>
          <xsd:element name="nationalRegistrationID" minOccurs="0" type="xsd:string"/>
+         <xsd:element name="registeredAddress" minOccurs="0" type="AddressInformation"/>
+         <xsd:element name="tradingAddress" minOccurs="0" type="AddressInformation"/>
+         <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="groupID" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="groupAdministrator" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="companyType" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="vatEnabled" minOccurs="0" type="xsd:boolean"/>
+        <xsd:element name="vatNumber" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="createIP" minOccurs="0" type="IPAddress"/>
+        <xsd:element name="createTime" minOccurs="0" type="GeneralizedTime"/>
+        <xsd:element name="modifiedDate" minOccurs="0" type="GeneralizedTime"/>   
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -602,7 +628,15 @@
          <xsd:element name="identificationNumber" minOccurs="0" type="xsd:string"/>
          <xsd:element name="authenticationInfo" minOccurs="0" type="AuthenticationInfo"/>
 		 <xsd:element name="profession" minOccurs="0" type="xsd:string"/>
-         <xsd:any namespace="##other" processContents="lax" 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="createTime" minOccurs="0" type="GeneralizedTime"/>
+        <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
 
@@ -646,6 +680,15 @@
 		 <xsd:element name="nationalTelephonySubscriptionInfo" minOccurs="0" type="NationalTelephonySubscriptionInfo"/>
 		 <xsd:element name="paymentDetails" minOccurs="0" type="PaymentDetails"/>
      <xsd:element name="subscriptionType" minOccurs="0" type="SubscriptionType"/>
+     <xsd:element name="deliveryAddress" minOccurs="0" type="AddressInformation"/>
+     <xsd:element name="resellerAddress" minOccurs="0" type="AddressInformation"/>
+     <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:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -1330,6 +1373,20 @@
                </xsd:restriction>
             </xsd:simpleType>
 		 </xsd:element>
+        <xsd:element name="tAI" minOccurs="0">
+          <xsd:simpleType>
+            <xsd:restriction base="xsd:hexBinary">
+              <xsd:length value="6"/>
+            </xsd:restriction>
+          </xsd:simpleType>
+        </xsd:element>
+        <xsd:element name="eCGI" minOccurs="0">
+          <xsd:simpleType>
+            <xsd:restriction base="xsd:hexBinary">
+              <xsd:length value="8"/>
+            </xsd:restriction>
+          </xsd:simpleType>
+        </xsd:element>
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -1417,6 +1474,11 @@
       <xsd:choice>
          <xsd:element name="gen2G" type="NULL"/>
          <xsd:element name="gen3G" type="NULL"/>
+        <xsd:element name="eUTRAN" type="NULL"/>
+        <xsd:element name="wLAN" type="NULL"/>
+        <xsd:element name="hSPAEvolution" type="NULL"/>
+        <xsd:element name="gAN" type="NULL"/>
+        <xsd:element name="vIRTUAL" type="NULL"/>
          <xsd:any namespace="##other" processContents="lax"/>
       </xsd:choice>
    </xsd:complexType>
@@ -1697,6 +1759,15 @@
             </xsd:complexType>
          </xsd:element>
         <xsd:element name="subscriptionType" minOccurs="0" type="SubscriptionType"/>
+        <xsd:element name="deliveryAddress" minOccurs="0" type="AddressInformation"/>
+        <xsd:element name="resellerAddress" minOccurs="0" type="AddressInformation"/>
+        <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:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -1838,6 +1909,13 @@
          <xsd:element name="subscriberID" minOccurs="0" type="NaSubscriberID"/>
 		 <xsd:element name="ePSInformation" minOccurs="0" type="EPSInformation"/>
         <xsd:element name="wifiInformation" minOccurs="0" type="WifiInformation"/>
+        <xsd:element name="addressTranslationRecords" minOccurs="0">
+          <xsd:complexType>
+            <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+              <xsd:element name="AddressTranslationRecord" type="AddressTranslationRecord"/>
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>        
 		 <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -1851,39 +1929,95 @@
           </xsd:restriction>
         </xsd:simpleType>
       </xsd:element>
-      <xsd:element name="sSID" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="sSID" minOccurs="0" type="xsd:string"/>      
       <xsd:element name="username" minOccurs="0" type="xsd:string"/>
-      <xsd:element name="protocol" minOccurs="0">
+      <xsd:element name="locationOfAccessPoint" minOccurs="0" type="Location"/>
+      <xsd:element name="authenticationType" minOccurs="0" type="AuthenticationType"/>
+      <xsd:element name="additionalAuthenticationInformation" minOccurs="0" type="AdditionalAuthenticationInformation"/>
+      <xsd:element name="accessPointIPAddress" minOccurs="0" type="IPAddress"/>
+      <xsd:element name="accessPointAdditionalDescriptions" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="accessPointAdditionalProviders" minOccurs="0" type="xsd:string"/>
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  
+  <xsd:complexType name="AuthenticationType">
+    <xsd:choice>
+      <xsd:element name="authenticationBySMS" type="NULL"/>
+      <xsd:element name="authenticationByCookie" type="NULL"/>
+      <xsd:element name="authenticationByMACAddress" type="NULL"/>
+      <xsd:element name="authenticationByEAPSIM" type="NULL"/>
+      <xsd:element name="authenticationByUsernameAndPassword" type="NULL"/>
+      <xsd:element name="authenticationByPaymentOrVoucher" type="NULL"/>      
+      <xsd:any namespace="##other" processContents="lax"/>
+    </xsd:choice>
+  </xsd:complexType>
+  
+  <xsd:complexType name="AdditionalAuthenticationInformation">
+    <xsd:sequence>
+      <xsd:element name="phoneNumber" minOccurs="0" type="PartyNumber"/>
+      <xsd:element name="mACAddress" minOccurs="0">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:hexBinary">
+            <xsd:length value="6"/>
+          </xsd:restriction>
+        </xsd:simpleType>
+      </xsd:element>
+      <xsd:element name="iMSI" minOccurs="0" type="IMSI"/>
+      <xsd:element name="username" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="password" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="paymentReference" minOccurs="0" type="xsd:string"/>
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="AddressTranslationRecord">
+    <xsd:sequence>
+      <xsd:element name="validity" minOccurs="0" type="TimeSpan"/>
+      <xsd:element name="privateIPAddress" minOccurs="0" type="IPAddress"/>
+      <xsd:element name="privatePort" minOccurs="0" type="xsd:integer"/>
+      <xsd:element name="publicIPAddress" minOccurs="0" type="IPAddress"/>
+      <xsd:element name="publicPort" minOccurs="0" type="AddressTranslationPortAssignment"/>
+      <xsd:element name="destinationIPAddress" minOccurs="0" type="IPAddress"/>
+      <xsd:element name="destinationPort" minOccurs="0" type="xsd:integer"/>
+      <xsd:element name="connectionType" minOccurs="0">
         <xsd:complexType>
           <xsd:choice>
-            <xsd:element name="iEEE80211" type="NULL"/>
-            <xsd:element name="iEEE80211a" type="NULL"/>
-            <xsd:element name="iEEE80211b" type="NULL"/>
-            <xsd:element name="iEEE80211g" type="NULL"/>            
-            <xsd:element name="iEEE80211n" type="NULL"/>
-            <xsd:element name="iEEE80211ac" type="NULL"/>
-            <xsd:element name="iEEE80211ad" type="NULL"/>
+            <xsd:element name="udp" type="NULL"/>
+            <xsd:element name="tcp" type="NULL"/>
+            <xsd:element name="sctp" type="NULL"/>
+            <xsd:element name="other" type="NULL"/>
             <xsd:any namespace="##other" processContents="lax"/>
           </xsd:choice>
         </xsd:complexType>
       </xsd:element>
-      <xsd:element name="securityMode" minOccurs="0">
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="AddressTranslationPortAssignment">
+    <xsd:choice>
+      <xsd:element name="singlePort" minOccurs="0" type="xsd:integer"/>
+      <xsd:element name="portRange" minOccurs="0">
         <xsd:complexType>
-          <xsd:choice>
-            <xsd:element name="wEP" type="NULL"/>
-            <xsd:element name="wPA" type="NULL"/>
-            <xsd:element name="wPA2" type="NULL"/>
-            <xsd:any namespace="##other" processContents="lax"/>
-          </xsd:choice>
+          <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="PortRange" type="PortRange"/>
+          </xsd:sequence>
         </xsd:complexType>
       </xsd:element>
-      <xsd:element name="authenticationTelephoneNumber" minOccurs="0" type="PartyNumber"/>
-      <xsd:element name="authenticationPaymentReference" minOccurs="0" type="xsd:string"/>
+      <xsd:any namespace="##other" processContents="lax"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="PortRange">
+    <xsd:sequence>
+      <xsd:element name="lowerBound" minOccurs="0" type="xsd:integer"/>      
+      <xsd:element name="upperBound" minOccurs="0" type="xsd:integer"/>
       <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
     </xsd:sequence>
   </xsd:complexType>
-  
-   <xsd:complexType name="EPSInformation">
+
+  <xsd:complexType name="EPSInformation">
       <xsd:sequence>
          <xsd:element name="iMSI" minOccurs="0" type="IMSI"/>
          <xsd:element name="iMSIUnauthenticatedFlag" minOccurs="0" type="IMSIUnauthenticatedFlag"/>
@@ -2068,8 +2202,9 @@
          <xsd:element name="requestPriority" minOccurs="0" type="RequestPriority"/>
          <xsd:element name="requestParameters" minOccurs="0" type="RequestConstraints"/>
          <xsd:element name="deliveryPointHIB" minOccurs="0" type="DeliveryPointHIB"/>
-		 <xsd:element name="maxHits" minOccurs="0" type="xsd:integer"/>
+		     <xsd:element name="maxHits" minOccurs="0" type="xsd:integer"/>
          <xsd:element name="nationalRequestParameters" minOccurs="0" type="NationalRequestParameters"/>
+         <xsd:element name="maxRecordsPerBatch" minOccurs="0" type="xsd:integer"/>        
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -2221,6 +2356,7 @@
                </xsd:sequence>
             </xsd:complexType>
 		 </xsd:element>
+        <xsd:element name="multimediaServiceRegistrationInfo" minOccurs="0" type="MultimediaServiceRegistrationInfo"/>
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
@@ -2235,8 +2371,27 @@
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
-   
-   <xsd:complexType name="SubscribedMultimediaServices">
+  
+  <xsd:complexType name="MultimediaServiceRegistrationInfo">
+    <xsd:sequence>
+      <xsd:element name="emailAddress" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="languageAtRegistration" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="accountCreationTime" minOccurs="0" type="GeneralizedTime"/>
+      <xsd:element name="accountCreationIP" minOccurs="0" type="IPAddress"/>
+      <xsd:element name="accountCreationCountry" minOccurs="0">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:string">
+            <xsd:length value="2"/>
+          </xsd:restriction>
+        </xsd:simpleType>
+      </xsd:element>
+      <xsd:element name="clientPlatformType" minOccurs="0" type="xsd:string"/>
+      <xsd:element name="clientVersion" minOccurs="0" type="xsd:string"/>
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="SubscribedMultimediaServices">
       <xsd:sequence>
          <xsd:element name="serviceID" minOccurs="0" type="xsd:string"/>
          <xsd:element name="providerID" minOccurs="0" type="xsd:string"/>
@@ -2258,7 +2413,18 @@
          <xsd:element name="nationalMultimediaServices" minOccurs="0" type="NationalMultimediaServices"/>
 		 <xsd:element name="paymentDetails" minOccurs="0" type="PaymentDetails"/>
         <xsd:element name="subscriptionType" minOccurs="0" type="SubscriptionType"/>
-         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+        <xsd:element name="deliveryAddress" minOccurs="0" type="AddressInformation"/>
+        <xsd:element name="resellerAddress" minOccurs="0" type="AddressInformation"/>
+        <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="multimediaServiceType" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="orderTime" minOccurs="0" type="GeneralizedTime"/>
+        <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
    
@@ -2318,8 +2484,13 @@
          <xsd:element name="imsInformation" minOccurs="0" type="ImsInformation"/>		 
          <xsd:element name="nationalMultimediaServiceUsage" minOccurs="0" type="NationalMultimediaServiceUsage"/>		 
          <xsd:element name="serviceID" minOccurs="0" type="xsd:string"/>		 
-         <xsd:element name="providerID" minOccurs="0" type="xsd:string"/>		 
-         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+         <xsd:element name="providerID" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="cdrNumber" minOccurs="0" type="xsd:string"/>
+        <xsd:element name="clientIP" minOccurs="0" type="IPAddress"/>
+        <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:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
 
@@ -2369,6 +2540,7 @@
          <xsd:element name="directory" type="NULL"/>
          <xsd:element name="broadcastReceiver" type="NULL"/>
          <xsd:element name="broadcastSender" type="NULL"/>
+        <xsd:element name="originalCalling" type="NULL"/>
          <xsd:any namespace="##other" processContents="lax"/>
       </xsd:choice>
    </xsd:complexType>
@@ -2452,11 +2624,21 @@
             </xsd:complexType>
 		 </xsd:element>
          <xsd:element name="nationalMultimediaBillingDetails" minOccurs="0" type="NationalMultimediaBillingDetails"/>
+        <xsd:element name="multimediaBillingAddress" minOccurs="0" type="MultimediaBillingAddress"/>
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
 
-   <xsd:complexType name="NationalMultimediaBillingDetails">
+  <xsd:complexType name="MultimediaBillingAddress">
+    <xsd:sequence>
+      <xsd:element name="addressSuppliedTime" minOccurs="0" type="GeneralizedTime"/>
+      <xsd:element name="name" minOccurs="0" type="PersonName"/>
+      <xsd:element name="address" minOccurs="0" type="AddressInformation"/>
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  
+  <xsd:complexType name="NationalMultimediaBillingDetails">
       <xsd:sequence>
          <xsd:element name="countryCode">
             <xsd:simpleType>
diff --git a/102657/portal/RDMessagever13.txt b/102657/portal/RDMessagever14.txt
similarity index 88%
rename from 102657/portal/RDMessagever13.txt
rename to 102657/portal/RDMessagever14.txt
index d0d4c20476d933ae9ef1c2f345942a6ac70e7483..9fc0818216432330e686fce054b586f6696450b8 100644
--- a/102657/portal/RDMessagever13.txt
+++ b/102657/portal/RDMessagever14.txt
@@ -1,4 +1,4 @@
-RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version13(13)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version14(14)}
 
 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) version13(13)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version14(14)}
 
 
 -- ======================================
@@ -106,7 +106,12 @@ RequestMessage ::= SEQUENCE
 		-- To be defined on a national basis 
 		-- Only to be used in case the present document cannot fulfil the national requirements
 		-- or to transmit a warrant.
-	...
+	...,
+	maxRecordsPerBatch			[6] INTEGER OPTIONAL
+		-- Indicates that multi-part delivery shall be used and each ResponseMessage shall not
+		-- contain more records than specified. (see clause 6.3.3.3)
+
+
 }
 
 DeliveryPointHIB ::= UTF8String
@@ -377,7 +382,28 @@ OrganizationInfo ::= SEQUENCE
 		-- address, and name/phone number of a point of contact
 	nationalRegistrationID	[3] UTF8String OPTIONAL,
 		-- e.g. social security number
-	...
+	...,
+	registeredAddress		[4] AddressInformation OPTIONAL,
+	tradingAddress			[5] AddressInformation OPTIONAL,
+	otherAddresses			[6] SEQUENCE OF OtherAddress OPTIONAL,
+	groupID					[7] UTF8String OPTIONAL,
+		-- identity of organization group
+	groupAdministrator		[8] UTF8String OPTIONAL,
+		-- identity of organization administrator
+	companyType				[9] UTF8String OPTIONAL,
+		-- type of company
+	vatEnabled				[10] BOOLEAN OPTIONAL,
+		-- VAT enabled or not
+	vatNumber				[11] UTF8String OPTIONAL,
+		-- VAT number
+	createIP				[12] IPAddress OPTIONAL,
+		-- IP used to create the subscriber account
+	createTime				[13] GeneralizedTime OPTIONAL,
+		-- time that subscriber account was created
+	modifiedDate			[14] GeneralizedTime OPTIONAL
+		-- date that subscriber account was modified
+
+
 }
 
 IndividualInfo ::= SEQUENCE
@@ -394,7 +420,11 @@ IndividualInfo ::= SEQUENCE
 	identificationNumber	[5] UTF8String OPTIONAL,
 	authenticationInfo		[6] AuthenticationInfo OPTIONAL,
 	...,
-	profession				[7] UTF8String OPTIONAL
+	profession				[7] UTF8String OPTIONAL,
+	otherAddresses			[8] SEQUENCE OF OtherAddress OPTIONAL,
+	createTime				[9] GeneralizedTime OPTIONAL
+		-- time that subscriber account was created
+
 }
 
 PersonName ::= SEQUENCE
@@ -449,6 +479,18 @@ AddressInformation ::= SEQUENCE
 	...
 }
 
+
+OtherAddress ::= SEQUENCE
+{
+	address			[1] AddressInformation OPTIONAL,
+	addressType		[2] UTF8String OPTIONAL,
+		-- Description of the type of address that has been given in the address field
+	addressComments	[3] UTF8String OPTIONAL,
+		-- Any extra information to aid the understanding of the address given
+	...
+}
+
+
 AuthenticationInfo ::= SEQUENCE
 {
 	authenticationType		[1] UTF8String OPTIONAL,
@@ -567,8 +609,11 @@ SubscribedTelephonyServices ::= SEQUENCE
 		-- To be defined on a national basis 
 		-- Only to be used in case the present document cannot fulfil the national requirements
 	paymentDetails						[17] PaymentDetails OPTIONAL,
-	subscriptionType					[18] SubscriptionType OPTIONAL  
+	subscriptionType					[18] SubscriptionType OPTIONAL,  
 		-- Describes the nature of the subscription
+	deliveryAddress						[19] AddressInformation OPTIONAL,
+	resellerAddress						[20] AddressInformation OPTIONAL,
+	otherAddresses						[21] SEQUENCE OF OtherAddress OPTIONAL
 
 }
 
@@ -1082,9 +1127,17 @@ TransmitterDetails ::= SEQUENCE
 
 TransmitterTechnology	::= ENUMERATED
 {
-	gen2G(0),
-	gen3G(1),
-	...
+	gen2G(0),		-- This corresponds to GERAN in 3GPP TS 29.274 [32]
+	gen3G(1),		-- This corresponds to UTRAN in 3GPP TS 29.274 [32]
+	...,
+	eUTRAN(2),
+	wLAN(3),
+	hSPAEvolution(4),
+	gAN(5),
+	vIRTUAL(6)
+	-- Note that the labels are taken from 3GPP TS 29.274 [32] v12.3.0 clause 8.17, though the
+	-- enumeration values (0 to 6) are not.
+
 }
 
 NationalTransmitterDetails	::= SEQUENCE
@@ -1124,8 +1177,15 @@ Location ::= SEQUENCE
 	...,
 	postalLocation		[8] AddressInformation OPTIONAL,
 	extendedLocation	[9] ExtendedLocation OPTIONAL,
-	userLocationInformation	[10] OCTET STRING (SIZE(1..35)) OPTIONAL
+	userLocationInformation	[10] OCTET STRING (SIZE(1..35)) OPTIONAL,
 		-- coded according to 3GPP TS 29.274 [32]; the type IE is not included
+	tAI			[11] OCTET STRING (SIZE (6)) OPTIONAL,
+		-- Only applicable to the CS traffic cases, such as SMS over SGs, according to 
+		-- 3GPP TS 23.272 [35]
+	eCGI			[12] OCTET STRING (SIZE (8)) OPTIONAL
+		-- Only applicable to the CS traffic cases, such as SMS over SGs, according to 
+		-- 3GPP TS 23.272 [35]
+
 }
 
 GSMLocation ::= CHOICE
@@ -1545,7 +1605,9 @@ MultimediaSubscriber ::= SEQUENCE
 		-- service-specific information about this subscriber
 	subscribedMultimediaServices	[4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL,
 		-- a subscriber (or account) may have more than one service listed against them
-	...
+	...,
+	multimediaServiceRegistrationInfo [5] MultimediaServiceRegistrationInfo OPTIONAL
+
 }
 
 MultimediaSubscriberInfo ::= SEQUENCE
@@ -1557,6 +1619,25 @@ MultimediaSubscriberInfo ::= SEQUENCE
 MultimediaSubscriberID ::= UTF8String
 	-- unique identifier for this subscriber, e.g. account number
 
+
+MultimediaServiceRegistrationInfo ::= SEQUENCE
+{
+	emailAddress				[1] UTF8String OPTIONAL, 
+	-- subscriber email address in RFC2822 format
+	languageAtRegistration		[2] UTF8String OPTIONAL, 
+	-- subscriber language as in ISO 639
+	accountCreationTime			[3] GeneralizedTime OPTIONAL, -- start time of account
+	accountCreationIP			[4] IPAddress OPTIONAL, -- subscriber IP at creation
+	accountCreationCountry 		[5] UTF8String (SIZE (2)) OPTIONAL, 
+	-- subscriber country as specified in ISO 3166-2
+	clientPlatformType			[6] UTF8String OPTIONAL, -- subscriber platform
+	clientVersion				[7] UTF8String OPTIONAL, -- subscriber platform version
+	...
+}
+
+
+
+
 SubscribedMultimediaServices ::= SEQUENCE
 {
 	serviceID					[1] UTF8String OPTIONAL,
@@ -1583,8 +1664,16 @@ SubscribedMultimediaServices ::= SEQUENCE
 		-- national extension
 	...,
 	paymentDetails				[13] PaymentDetails OPTIONAL,
-	subscriptionType			[14] SubscriptionType OPTIONAL  
+	subscriptionType			[14] SubscriptionType OPTIONAL,  
 		-- Describes the nature of the subscription
+	deliveryAddress				[15] AddressInformation OPTIONAL,
+	resellerAddress				[16] AddressInformation OPTIONAL,
+	otherAddresses				[17] SEQUENCE OF OtherAddress 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
+
 
 }
 
@@ -1632,7 +1721,14 @@ MultimediaServiceUsage ::= SEQUENCE
 	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
+
+
 }
 
 MultimediaPartyInformation ::= SEQUENCE
@@ -1680,7 +1776,8 @@ MultimediaPartyRole	::=	ENUMERATED
 	directory(7),
 	broadcastReceiver(8),
 	broadcastSender(9),
-	...
+	...,
+	originalCalling (10)
 }
 
 MultimediaBearerService	::=	ENUMERATED
@@ -1748,9 +1845,20 @@ MultimediaBillingDetails ::= SEQUENCE
 	nationalMultimediaBillingDetails	[6] NationalMultimediaBillingDetails OPTIONAL,
 		-- To be defined on a national basis 
 		-- Only to be used in case the present document cannot fulfil the national requirements
+	...,
+	multimediaBillingAddress			[7] MultimediaBillingAddress OPTIONAL
+
+}
+
+MultimediaBillingAddress ::= SEQUENCE
+{
+	addressSuppliedTime			[1] GeneralizedTime OPTIONAL,
+	name						[2] PersonName OPTIONAL,
+	address						[3] AddressInformation  OPTIONAL,
 	...
 }
 
+
 NationalMultimediaBillingDetails ::= SEQUENCE
 {
 	countryCode		[1] UTF8String (SIZE (2)),
@@ -1895,8 +2003,13 @@ NAServiceSubscription ::= SEQUENCE
 	nationalNASubscription	[12] NationalNASubscription OPTIONAL,
 	paymentDetails			[13] PaymentDetails OPTIONAL,
 	additionalIPAddresses	[14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL,
-	subscriptionType		[15] SubscriptionType OPTIONAL  
+	subscriptionType		[15] SubscriptionType OPTIONAL,
 		-- Describes the nature of the subscription
+	deliveryAddress			[16] AddressInformation OPTIONAL,
+	resellerAddress			[17] AddressInformation OPTIONAL,
+	otherAddresses			[18] SEQUENCE OF OtherAddress OPTIONAL
+
+
 }
 
 NationalNASubscription ::= SEQUENCE
@@ -1950,7 +2063,135 @@ NAServiceUsage ::= SEQUENCE
 	subscriberID		[15] NaSubscriberID OPTIONAL,
 		-- Identifier for a known user of this network access
 	ePSInformation		[16] EPSInformation OPTIONAL,
-	wifiInformation		[17] WifiInformation OPTIONAL
+	wifiInformation		[17] WifiInformation OPTIONAL,
+	addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL
+	-- contains extended information about the NAT or PAT operations carried out within this
+	-- service usage session
+
+
+}
+
+
+
+WifiInformation ::= SEQUENCE
+{
+	bSSID					[1] OCTET STRING (SIZE (6)) OPTIONAL,
+		-- The Basic Service Set Identification for the connection.
+		-- This is also the MAC address of the access point (the present document assumes 
+		-- that records are for infrastructure mode, not ad-hoc mode).
+		-- The MAC address of the user is given in the naDeviceID in the structure (one level up) 
+	sSID					[2] UTF8String OPTIONAL,
+		-- The human-readable Service Set Identifier
+		-- It should be noted that this is typically only available on the air interface and so 
+		-- is not likely to be logged by CSPs (though may be recorded at a more local level).
+		-- Therefore requesting organizations should not expect this to be populated typically.
+		-- It is not guaranteed to be unique.
+	username				[3] UTF8String OPTIONAL,
+	locationOfAccessPoint	[4] Location OPTIONAL, 
+		-- Location of the Access Point as lat/long, grid reference or postal address.
+		-- Requesting organizations should be aware that Access Points can be moved, sometimes
+		-- without the knowledge of the CSP
+	authenticationType 			[5] AuthenticationType OPTIONAL,
+	additionalAuthenticationInformation 	[6] AdditionalAuthenticationInformation OPTIONAL,
+	...,
+
+	accessPointIPAddress			 [7] IPAddress  OPTIONAL,
+	accessPointAdditionalDescriptions[8] SEQUENCE OF UTF8String OPTIONAL,
+			-- Informal description of location, category or type of access point, 
+			-- or a name of the network to which the access point belongs.
+	accessPointAdditionalProviders   [9] SEQUENCE OF UTF8String OPTIONAL
+			-- For WiFi, there may be other parties involved in hosting or owning the
+			-- Access Points, e.g. access point provider or partner providers
+
+}
+
+
+AuthenticationType ::= ENUMERATED
+{
+	authenticationBySMS (1),
+	    -- Used if authentication arranged through a code sent to mobile
+		-- additionalAuthenticationInformation shall contain the phone number
+	authenticationByCookie  (2),
+	    -- If authentication was granted on the basis of a cookie left from a previous visit to a 
+		-- site.
+		-- No other mandatory addtionalAuthenticationInformation
+	authenticationByMACAddress	(3),
+		-- If authentication was granted because the MAC address of the UE was recognised due
+		-- to a previous visit. 
+		-- additionalAuthenticationInformation shall contain the MAC Address unless it is already 
+		-- populated as NADeviceID in this record.
+	authenticationByEAPSIM (4),	
+		-- If authenticated by EAP SIM see TS 33.234 [X]
+		-- additionalAuthenticationInformation shall contain the IMSI
+	-- Other varieties of EAP could be added here later, together with any extra information they 
+	-- could provide.
+	authenticationByUsernameAndPassword (5),
+		-- additionalAuthenticationInformation should contain username and password if appropriate
+	authenticationByPaymentOrVoucher (6),
+		-- additionalAuthenticationInformation should contain Voucher or Payment details 
+		-- if appropriate. 
+	...
+}
+
+AdditionalAuthenticationInformation ::= SEQUENCE
+{
+	phoneNumber  		[1] PartyNumber OPTIONAL,
+	    -- e.g. number to which an SMS was sent
+	mACAddress			[2] OCTET STRING (SIZE (6)) OPTIONAL,
+	iMSI				[3] IMSI OPTIONAL,
+	username			[4] UTF8String OPTIONAL, 
+			-- Names supplied are unlikely to be verified
+	password			[5] UTF8String OPTIONAL,
+			-- Only to be populated if it is both appropriate and available
+	paymentReference	[6] UTF8String OPTIONAL,
+		-- For example, the number of a voucher that was used in authentication
+	...
+}
+
+
+
+AddressTranslationRecord ::= SEQUENCE
+{
+	validity 							[1] TimeSpan OPTIONAL,
+		-- time at which the address translation started and/or ended
+	privateIPAddress 					[2] IPAddress OPTIONAL,
+		-- the private IP of the host
+	privatePort 						[3] INTEGER OPTIONAL,
+		-- the private port of the host
+	publicIPAddress						[4] IPAddress OPTIONAL,
+		-- the translated IP of the host, i.e. the address known by the remote host 
+	publicPort							[5] AddressTranslationPortAssignment OPTIONAL,
+		-- the translated port(s) of the host, i.e. the port(s) known by the remote host, if 		   		   applicable
+	destinationIPAddress				[6] IPAddress OPTIONAL,
+		-- the IP address of the remote host
+	destinationPort						[7] INTEGER OPTIONAL,
+		-- the port of the remote host
+	connectionType						[8] ENUMERATED
+	{
+		udp (0),
+		tcp (1),
+		sctp (2),
+		other (3),
+		...
+	} OPTIONAL,
+	...
+}
+
+AddressTranslationPortAssignment ::= CHOICE
+{
+	singlePort						[1] INTEGER,
+		-- only one port is assigned to the host, that port number is specified here
+	portRange						[2] SEQUENCE OF PortRange,
+		-- if a range of translated ports is assigned to the host, specify it here
+	...
+}
+
+PortRange ::= SEQUENCE
+{
+	-- The range given is inclusive of both ends
+	lowerBound		[1] INTEGER OPTIONAL,
+	upperBound		[2] INTEGER OPTIONAL,
+	...
 }
 
 NAEndReason ::= ENUMERATED
@@ -2080,7 +2321,7 @@ EPSEvent ::= ENUMERATED
 -- The list of “EPSEvent” below is partly taken from 3GPP TS 33.108
 -- EpsHI2Operations from the “EPSEvent ::=ENUMERATED” module
 {
-    e-UTRANAttach					 				   (16),
+    e-UTRANAttach			    (16),
     e-UTRANDetach                           (17),
     bearerActivation                        (18),
     bearerModification                      (20),
@@ -2090,45 +2331,6 @@ EPSEvent ::= ENUMERATED
 	...
 }
 
-
-WifiInformation ::= SEQUENCE
-{
-	bSSID					[1] OCTET STRING (SIZE (6)) OPTIONAL,
-		-- The Basic Service Set Identification for the connection.
-		-- This is also the MAC address of the access point (the present document assumes 
-		-- that records are for infrastructure mode, not ad-hoc mode).
-		-- The MAC address of the user is given in the naDeviceID in the structure (one level up) 
-	sSID					[2] UTF8String OPTIONAL,
-		-- The human-readable Service Set Identifier
-	username				[3] UTF8String OPTIONAL,
-	protocol				[4] ENUMERATED
-	{
-		iEEE80211 (1),
-		iEEE80211a (2),
-		iEEE80211b (3),
-		iEEE80211g (4),
-		iEEE80211n (5),
-		iEEE80211ac (6),
-		iEEE80211ad (7),
-		...
-	} OPTIONAL,
-	securityMode			[5] ENUMERATED
-	{
-		wEP (0),
-		wPA (1),
-		wPA2 (2),
-		...
-	} OPTIONAL,
-	authenticationTelephoneNumber    [6] PartyNumber OPTIONAL,
-	    -- if authentication arranged through a code sent to mobile, this is the number 
-		-- to which the code was sent
-	authenticationPaymentReference	 [7] UTF8String OPTIONAL,
-		-- For example, the number of a voucher that was used in authentication
-	...
-}
-
-
-
 -- ====================================
 -- Definitions of Network Access Device
 -- ====================================