diff --git a/TS_103_280.asn1 b/TS_103_280.asn1
index 0e186a90fe68f87c846dd4533d69a0edc1f0af71..68cfe54e9a3e75ef0565bd50cd1c0d4bdbc8793f 100644
--- a/TS_103_280.asn1
+++ b/TS_103_280.asn1
@@ -1,94 +1,94 @@
 Common-Parameters
-{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)}
+{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)}
 
 DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN
 
 -- Object Identifier definitions
 
-commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)}
+commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)}
 
--- Common Parameter: LIID (as defined in clause 6)
+-- Common Parameters (below are as defined in clause 6)
 
 LIID ::= OCTET STRING (SIZE (1..25))
 
--- Common Parameter: TCPPort (as defined in clause 6)
-
 TCPPort ::= INTEGER (1..65535)
 
--- Common Parameter: TCPPortRange (as defined in clause 6)
-
 TCPPortRange ::= SEQUENCE
 {
     start [0] TCPPort,
     end   [1] TCPPort
 }
 
--- Common Parameter: UDPPort (as defined in clause 6)
-
 UDPPort ::= INTEGER (0..65535)
 
--- Common Parameter: UDPPortRange (as defined in clause 6)
-
 UDPPortRange ::= SEQUENCE
 {
     start [0] UDPPort,
     end   [1] UDPPort
 }
 
--- Common Parameter: Port (as defined in clause 6)
-
 Port ::= CHOICE
 {
     tCPPort [0] TCPPort,
     uDPPort [1] UDPPort
 }
 
--- Common Parameter: PortRange (as defined clause 6)
-
 PortRange ::= CHOICE
 {
     tCPPortRange [0] TCPPortRange,
     uDPPortRange [1] UDPPortRange
 }
 
--- Common Parameter: QualifiedDateTime (as defined in clause 6)
-
 QualifiedDateTime ::= GeneralizedTime
 
--- Common Parameter: QualifiedMicrosecondDateTime (as defined in clause 6)
-
 QualifiedMicrosecondDateTime ::= GeneralizedTime
 
--- Common Parameter: WGS84CoordinateDecimal (as defined in clause 6)
-
 WGS84CoordinateDecimal ::= SEQUENCE
 {
     latitude  [0] WGS84LatitudeDecimal,
     longitude [1] WGS84LongitudeDecimal
 }
 
--- Common Parameter: WGS84LatitudeDecimal (as defined in clause 6)
-
 WGS84LatitudeDecimal ::= OCTET STRING (SIZE (10))
 
--- Common Parameter: WGS84LongitudeDecimal (as defined in clause 6)
-
 WGS84LongitudeDecimal ::= OCTET STRING (SIZE (11))
 
--- Common Parameter: WGS84CoordinateAngular (as defined in clause 6)
-
 WGS84CoordinateAngular ::= SEQUENCE
 {
     latitude  [0] WGS84LatitudeAngular,
     longitude [1] WGS84LongitudeAngular
 }
 
--- Common Parameter: WGS84LatitudeAngular (as defined in clause 6)
-
 WGS84LatitudeAngular ::= OCTET STRING (SIZE (10))
 
--- Common Parameter: WGS8LongitudeAngular (as defined in clause 6)
-
 WGS84LongitudeAngular ::= OCTET STRING (SIZE (11))
 
+InternationalE164 ::= NumericString (SIZE(1..15))
+
+IMSI ::= NumericString (SIZE(6..15))
+
+IMEI ::= NumericString (SIZE(14))
+
+IMEICheckDigit ::= NumericString (SIZE(15))
+
+IMEISV ::= NumericString (SIZE(16))
+
+SUPIIMSI ::= IMSI
+
+SUPINAI ::= NAI
+
+SUCI ::= OCTET STRING
+
+PEIIMEI ::= IMEI
+
+PEIIMEICheckDigit ::= IMEICheckDigit
+
+PEIIMEISV ::= IMEISV
+
+GPSIMSISDN ::= NumericString (SIZE(1..15))
+
+GPSINAI ::= NAI
+
+NAI ::= UTF8String
+
 END
diff --git a/ts_103280.xsd b/ts_103280.xsd
index 3313fa31f54c24e1c0d4273ed8a0bf5235088894..09ac93ab7d3dcac2366ec1de62eba68a6aa36e66 100644
--- a/ts_103280.xsd
+++ b/ts_103280.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.2.1" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.3.1" elementFormDefault="qualified">
     <xs:simpleType name="ShortString">
         <xs:restriction base="xs:string">
             <xs:maxLength value="255"/>
@@ -55,6 +55,11 @@
             <xs:pattern value="[0-9]{15}"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="IMEISV">
+        <xs:restriction base="xs:token">
+            <xs:pattern value="[0-9]{16}"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:simpleType name="IPv4Address">
         <xs:restriction base="xs:token">
             <xs:pattern value="((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])"/>
@@ -86,7 +91,7 @@
             <xs:element name="IPv4CIDR" type="IPv4CIDR"/>
             <xs:element name="IPv6CIDR" type="IPv6CIDR"/>
         </xs:choice>
-    </xs:complexType> 
+    </xs:complexType>
     <xs:simpleType name="TCPPort">
         <xs:restriction base="xs:integer">
             <xs:minExclusive value="1"/>
@@ -116,25 +121,25 @@
             <xs:element name="TCPPort" type="TCPPort"/>
             <xs:element name="UDPPort" type="UDPPort"/>
         </xs:choice>
-    </xs:complexType> 
+    </xs:complexType>
     <xs:complexType name="PortRange">
         <xs:choice>
             <xs:element name="TCPPortRange" type="TCPPortRange"/>
             <xs:element name="UDPPortRange" type="UDPPortRange"/>
         </xs:choice>
-    </xs:complexType> 
+    </xs:complexType>
     <xs:complexType name="IPAddressPort">
         <xs:sequence>
             <xs:element name="address" type="IPAddress"/>
             <xs:element name="port" type="Port"/>
         </xs:sequence>
-    </xs:complexType> 
+    </xs:complexType>
     <xs:complexType name="IPAddressPortRange">
         <xs:sequence>
             <xs:element name="address" type="IPAddress"/>
             <xs:element name="portRange" type="PortRange"/>
         </xs:sequence>
-    </xs:complexType> 
+    </xs:complexType>
     <xs:simpleType name="MACAddress">
         <xs:restriction base="xs:token">
             <xs:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/>
@@ -165,7 +170,7 @@
             <xs:pattern value="tel:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>
         </xs:restriction>
     </xs:simpleType>
-   <xs:complexType name="WGS84CoordinateDecimal">
+    <xs:complexType name="WGS84CoordinateDecimal">
         <xs:sequence>
             <xs:element name="latitude" type="WGS84LatitudeDecimal"/>
             <xs:element name="longitude" type="WGS84LongitudeDecimal"/>
@@ -197,4 +202,33 @@
             <xs:pattern value="[EW][0-9]{7}\.[0-9]{2}"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="SUPIIMSI">
+        <xs:restriction base="IMSI"/>
+    </xs:simpleType>
+    <xs:simpleType name="SUPINAI">
+        <xs:restriction base="NAI"/>
+    </xs:simpleType>
+    <xs:simpleType name="SUCI">
+        <xs:restriction base="xs:hexBinary"/>
+    </xs:simpleType>
+    <xs:simpleType name="PEIIMEI">
+        <xs:restriction base="IMEI"/>
+    </xs:simpleType>
+    <xs:simpleType name="PEIIMEICheckDigit">
+        <xs:restriction base="IMEICheckDigit"/>
+    </xs:simpleType>
+    <xs:simpleType name="PEIIMEISV">
+        <xs:restriction base="IMEISV"/>
+    </xs:simpleType>
+     <xs:simpleType name="GPSIMSISDN">
+        <xs:restriction base="xs:token">
+            <xs:pattern value="[0-9]{1,15}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="GPSINAI">
+        <xs:restriction base="NAI"/>
+    </xs:simpleType>
+    <xs:simpleType name="NAI">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
 </xs:schema>