diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index 9fc0818216432330e686fce054b586f6696450b8..cd26c7215bf79f8f414a551cd7e1eb80de289741 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) version14(14)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version15(15)}
 
 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) version14(14)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version15(15)}
 
 
 -- ======================================
@@ -1976,7 +1976,10 @@ NASubscriber ::= SEQUENCE
 		-- List of all known devices allocated to this user. 
 	subscriber			[5] GenericSubscriberInfo OPTIONAL ,
 		-- Name, address and other generic subscriber information
-	...
+	...,
+	allocatedDevices	[6] SEQUENCE OF NADevice OPTIONAL
+		-- If present, contains device details for all elements from allocatedDeviceIDs
+
 }
 
 NAServiceSubscription ::= SEQUENCE
@@ -2007,9 +2010,9 @@ NAServiceSubscription ::= SEQUENCE
 		-- Describes the nature of the subscription
 	deliveryAddress			[16] AddressInformation OPTIONAL,
 	resellerAddress			[17] AddressInformation OPTIONAL,
-	otherAddresses			[18] SEQUENCE OF OtherAddress OPTIONAL
-
-
+	otherAddresses			[18] SEQUENCE OF OtherAddress OPTIONAL,
+	allocatedDevices		[19] SEQUENCE OF NADevice OPTIONAL
+		-- If present, contains device details for all elements from allocatedDeviceIDs
 }
 
 NationalNASubscription ::= SEQUENCE
@@ -2064,9 +2067,11 @@ NAServiceUsage ::= SEQUENCE
 		-- Identifier for a known user of this network access
 	ePSInformation		[16] EPSInformation OPTIONAL,
 	wifiInformation		[17] WifiInformation OPTIONAL,
-	addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL
+	addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL,
 	-- contains extended information about the NAT or PAT operations carried out within this
 	-- service usage session
+	naDevice			[19] NADevice OPTIONAL
+		-- If present, contains the device details for the device referenced in naDeviceID
 
 
 }
diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index a67efde8c0ae0960708b460f5b899d160e34d6fa..081f77ee5881f4a000bec9307b9850f9ec1a91c8 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.14.1#/RetainedData"
-            targetNamespace="http://uri.etsi.org/02657/v1.14.1#/RetainedData"
+            xmlns="http://uri.etsi.org/02657/v1.15.1#/RetainedData"
+            targetNamespace="http://uri.etsi.org/02657/v1.15.1#/RetainedData"
 			elementFormDefault="qualified">
 
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.14.1 
+			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.15.1 
 		</xsd:documentation>
 	</xsd:annotation>
 
@@ -1413,7 +1413,7 @@
       <xsd:sequence>
          <xsd:element name="centre" minOccurs="0" type="Spot"/>
          <xsd:element name="radius" minOccurs="0" type="xsd:int"/>
-         <xsd:any namespace="##other" processContents="lax"/>
+         <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
    </xsd:complexType>
    
@@ -1426,7 +1426,7 @@
                </xsd:sequence>
             </xsd:complexType>
          </xsd:element>
-         <xsd:any namespace="##other" processContents="lax"/>
+         <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
    </xsd:complexType>
 
@@ -1440,7 +1440,7 @@
             </xsd:complexType>
          </xsd:element>
          <xsd:element name="width" minOccurs="0" type="xsd:int"/>
-         <xsd:any namespace="##other" processContents="lax"/>
+         <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
    </xsd:complexType>
    
@@ -1768,8 +1768,15 @@
             </xsd:sequence>
           </xsd:complexType>
         </xsd:element>
-		 <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
-      </xsd:sequence>
+      <xsd:element name="allocatedDevices" minOccurs="0">
+		     <xsd:complexType>
+		        <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+			         <xsd:element name="NADevice" type="NADevice"/>
+			      </xsd:sequence>
+		     </xsd:complexType>
+		  </xsd:element>
+		  <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+     </xsd:sequence>
    </xsd:complexType>
       
    <xsd:complexType name="NationalNASubscription">
@@ -1804,7 +1811,14 @@
             </xsd:complexType>
          </xsd:element>
          <xsd:element name="subscriber" minOccurs="0" type="GenericSubscriberInfo"/>
-         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+         <xsd:element name="allocatedDevices" minOccurs="0">
+		        <xsd:complexType>
+		           <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+			            <xsd:element name="NADevice" type="NADevice"/>
+			         </xsd:sequence>
+		        </xsd:complexType>
+		     </xsd:element>
+        <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
 
@@ -1907,7 +1921,7 @@
          <xsd:element name="octetsUploaded" minOccurs="0" type="xsd:integer"/>
          <xsd:element name="endReason" minOccurs="0" type="NAEndReason"/>
          <xsd:element name="subscriberID" minOccurs="0" type="NaSubscriberID"/>
-		 <xsd:element name="ePSInformation" minOccurs="0" type="EPSInformation"/>
+		    <xsd:element name="ePSInformation" minOccurs="0" type="EPSInformation"/>
         <xsd:element name="wifiInformation" minOccurs="0" type="WifiInformation"/>
         <xsd:element name="addressTranslationRecords" minOccurs="0">
           <xsd:complexType>
@@ -1915,8 +1929,9 @@
               <xsd:element name="AddressTranslationRecord" type="AddressTranslationRecord"/>
             </xsd:sequence>
           </xsd:complexType>
-        </xsd:element>        
-		 <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+        </xsd:element>
+        <xsd:element name="naDevice" minOccurs="0" type="NADevice"/>
+        <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
 
diff --git a/102657/portal/RDMessage,ver14.xsd b/102657/portal/RDMessage,ver15.xsd
similarity index 98%
rename from 102657/portal/RDMessage,ver14.xsd
rename to 102657/portal/RDMessage,ver15.xsd
index a67efde8c0ae0960708b460f5b899d160e34d6fa..081f77ee5881f4a000bec9307b9850f9ec1a91c8 100644
--- a/102657/portal/RDMessage,ver14.xsd
+++ b/102657/portal/RDMessage,ver15.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.14.1#/RetainedData"
-            targetNamespace="http://uri.etsi.org/02657/v1.14.1#/RetainedData"
+            xmlns="http://uri.etsi.org/02657/v1.15.1#/RetainedData"
+            targetNamespace="http://uri.etsi.org/02657/v1.15.1#/RetainedData"
 			elementFormDefault="qualified">
 
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.14.1 
+			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.15.1 
 		</xsd:documentation>
 	</xsd:annotation>
 
@@ -1413,7 +1413,7 @@
       <xsd:sequence>
          <xsd:element name="centre" minOccurs="0" type="Spot"/>
          <xsd:element name="radius" minOccurs="0" type="xsd:int"/>
-         <xsd:any namespace="##other" processContents="lax"/>
+         <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
    </xsd:complexType>
    
@@ -1426,7 +1426,7 @@
                </xsd:sequence>
             </xsd:complexType>
          </xsd:element>
-         <xsd:any namespace="##other" processContents="lax"/>
+         <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
    </xsd:complexType>
 
@@ -1440,7 +1440,7 @@
             </xsd:complexType>
          </xsd:element>
          <xsd:element name="width" minOccurs="0" type="xsd:int"/>
-         <xsd:any namespace="##other" processContents="lax"/>
+         <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
    </xsd:complexType>
    
@@ -1768,8 +1768,15 @@
             </xsd:sequence>
           </xsd:complexType>
         </xsd:element>
-		 <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
-      </xsd:sequence>
+      <xsd:element name="allocatedDevices" minOccurs="0">
+		     <xsd:complexType>
+		        <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+			         <xsd:element name="NADevice" type="NADevice"/>
+			      </xsd:sequence>
+		     </xsd:complexType>
+		  </xsd:element>
+		  <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+     </xsd:sequence>
    </xsd:complexType>
       
    <xsd:complexType name="NationalNASubscription">
@@ -1804,7 +1811,14 @@
             </xsd:complexType>
          </xsd:element>
          <xsd:element name="subscriber" minOccurs="0" type="GenericSubscriberInfo"/>
-         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+         <xsd:element name="allocatedDevices" minOccurs="0">
+		        <xsd:complexType>
+		           <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+			            <xsd:element name="NADevice" type="NADevice"/>
+			         </xsd:sequence>
+		        </xsd:complexType>
+		     </xsd:element>
+        <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
 
@@ -1907,7 +1921,7 @@
          <xsd:element name="octetsUploaded" minOccurs="0" type="xsd:integer"/>
          <xsd:element name="endReason" minOccurs="0" type="NAEndReason"/>
          <xsd:element name="subscriberID" minOccurs="0" type="NaSubscriberID"/>
-		 <xsd:element name="ePSInformation" minOccurs="0" type="EPSInformation"/>
+		    <xsd:element name="ePSInformation" minOccurs="0" type="EPSInformation"/>
         <xsd:element name="wifiInformation" minOccurs="0" type="WifiInformation"/>
         <xsd:element name="addressTranslationRecords" minOccurs="0">
           <xsd:complexType>
@@ -1915,8 +1929,9 @@
               <xsd:element name="AddressTranslationRecord" type="AddressTranslationRecord"/>
             </xsd:sequence>
           </xsd:complexType>
-        </xsd:element>        
-		 <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+        </xsd:element>
+        <xsd:element name="naDevice" minOccurs="0" type="NADevice"/>
+        <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
 
diff --git a/102657/portal/RDMessagever14.txt b/102657/portal/RDMessagever15.txt
similarity index 99%
rename from 102657/portal/RDMessagever14.txt
rename to 102657/portal/RDMessagever15.txt
index 9fc0818216432330e686fce054b586f6696450b8..cd26c7215bf79f8f414a551cd7e1eb80de289741 100644
--- a/102657/portal/RDMessagever14.txt
+++ b/102657/portal/RDMessagever15.txt
@@ -1,4 +1,4 @@
-RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version14(14)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version15(15)}
 
 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) version14(14)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version15(15)}
 
 
 -- ======================================
@@ -1976,7 +1976,10 @@ NASubscriber ::= SEQUENCE
 		-- List of all known devices allocated to this user. 
 	subscriber			[5] GenericSubscriberInfo OPTIONAL ,
 		-- Name, address and other generic subscriber information
-	...
+	...,
+	allocatedDevices	[6] SEQUENCE OF NADevice OPTIONAL
+		-- If present, contains device details for all elements from allocatedDeviceIDs
+
 }
 
 NAServiceSubscription ::= SEQUENCE
@@ -2007,9 +2010,9 @@ NAServiceSubscription ::= SEQUENCE
 		-- Describes the nature of the subscription
 	deliveryAddress			[16] AddressInformation OPTIONAL,
 	resellerAddress			[17] AddressInformation OPTIONAL,
-	otherAddresses			[18] SEQUENCE OF OtherAddress OPTIONAL
-
-
+	otherAddresses			[18] SEQUENCE OF OtherAddress OPTIONAL,
+	allocatedDevices		[19] SEQUENCE OF NADevice OPTIONAL
+		-- If present, contains device details for all elements from allocatedDeviceIDs
 }
 
 NationalNASubscription ::= SEQUENCE
@@ -2064,9 +2067,11 @@ NAServiceUsage ::= SEQUENCE
 		-- Identifier for a known user of this network access
 	ePSInformation		[16] EPSInformation OPTIONAL,
 	wifiInformation		[17] WifiInformation OPTIONAL,
-	addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL
+	addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL,
 	-- contains extended information about the NAT or PAT operations carried out within this
 	-- service usage session
+	naDevice			[19] NADevice OPTIONAL
+		-- If present, contains the device details for the device referenced in naDeviceID
 
 
 }