diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index 7d312cec22d9ee559f99a04d916344d70c35dab5..f5b95921922c14f7731e80098a82616752be9c94 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -3045,7 +3045,9 @@ PEI ::= CHOICE
 {
     iMEI        [1] IMEI,
     iMEISV      [2] IMEISV,
-    ...
+    ...,
+    mACAddress  [3] MACAddress,
+    eUI64       [4] EUI64
 }
 
 
@@ -3056,6 +3058,10 @@ IMEI ::= OCTET STRING (SIZE(8))
 
 IMEISV ::= NumericString (SIZE(16))
 
+MACAddress ::= UTF8String
+
+EUI64 ::= UTF8String
+
 IMSI ::= OCTET STRING (SIZE(3..8))
     -- format as per 3GPP TS 09.02 [8]
 
diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index f3b0e7791090ee2fb6fa3b0c733e40b2e47c646f..4ca7c64b669cf441f20450c31489cbc887f483af 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -434,6 +434,16 @@
             <xsd:pattern value="[0-9]{16}"/>
         </xsd:restriction>
     </xsd:simpleType>
+    <xsd:simpleType name="MACAddress">
+        <xsd:restriction base="xsd:token">
+            <xsd:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="EUI64">
+        <xsd:restriction base="xsd:token">
+            <xsd:pattern value="([a-f0-9]{2}:){7}[a-f0-9]{2}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
     <xsd:simpleType name="IMSI">
         <xsd:restriction base="xsd:hexBinary">
             <xsd:minLength value="3"/>
@@ -3313,7 +3323,9 @@
         <xsd:choice>
             <xsd:element name="iMEI" type="IMEI"/>
             <xsd:element name="iMEISV" type="IMEISV"/>
-            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+            <xsd:element name="mACAddress" type="MACAddress"/>
+            <xsd:element name="eUI64" type="EUI64"/>
+            <xsd:any namespace="##other" processContents="lax"/>
         </xsd:choice>
     </xsd:complexType>
     <xsd:simpleType name="UERadioCapID">