diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1
index ac8c776882aa81829cd521b7a64779900b3b1bb0..805c772e1e9ef7a336acfc7810cf0326fe4e48b1 100644
--- a/103280/TS_103_280.asn1
+++ b/103280/TS_103_280.asn1
@@ -11,6 +11,52 @@ commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(
 
 LIID ::= OCTET STRING (SIZE (1..25))
 
+UTCDateTime ::= GeneralizedTime
+
+UTCMicrosecondDateTime ::= GeneralizedTime
+
+QualifiedDateTime ::= GeneralizedTime
+
+QualifiedMicrosecondDateTime ::= GeneralizedTime
+
+InternationalE164 ::= NumericString (SIZE(1..15))
+
+IMSI ::= NumericString (SIZE(6..15))
+
+IMEI ::= NumericString (SIZE(14))
+
+IMEICheckDigit ::= NumericString (SIZE(15))
+
+IMEISV ::= NumericString (SIZE(16))
+
+IPv4Address ::= UTF8String (SIZE (7..15))
+
+IPv4CIDR ::= SEQUENCE
+{
+    address [0] IPv4Address,
+    prefix  [1] INTEGER (0..32)
+}
+
+IPv6Address ::= UTF8String (SIZE (39))
+
+IPv6CIDR ::= SEQUENCE
+{
+    address [0] IPv6Address,
+    prefix  [1] INTEGER (0..128)
+}
+
+IPAddress ::= CHOICE
+{
+    iPv4Address [1] IPv4Address,
+    iPv6Address [2] IPv6Address
+}
+
+IPCIDR ::= CHOICE
+{
+    iPv4CIDR [1] IPv4CIDR,
+    iPv6CIDR [2] IPv6CIDR
+}
+
 TCPPort ::= INTEGER (1..65535)
 
 TCPPortRange ::= SEQUENCE
@@ -39,9 +85,33 @@ PortRange ::= CHOICE
     uDPPortRange [1] UDPPortRange
 }
 
-QualifiedDateTime ::= GeneralizedTime
+IPAddressPort ::= SEQUENCE
+{
+    address [0] IPAddress,
+    port    [1] Port
+}
 
-QualifiedMicrosecondDateTime ::= GeneralizedTime
+IPAddressPortRange ::= SEQUENCE
+{
+    address   [0] IPAddress,
+    portRange [1] PortRange
+}
+
+MACAddress ::= UTF8String (SIZE (17))
+
+EmailAddress ::= UTF8String
+
+UUID ::= UTF8String (SIZE (36))
+
+ISOCountryCode ::= UTF8String (SIZE (2))
+
+ShortString ::= UTF8String (SIZE (0..255))
+
+LongString ::= UTF8String (SIZE (0..65535))
+
+SIPURI ::= UTF8String
+
+TELURI ::= UTF8String
 
 WGS84CoordinateDecimal ::= SEQUENCE
 {
@@ -63,16 +133,6 @@ WGS84LatitudeAngular ::= OCTET STRING (SIZE (10))
 
 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
@@ -91,12 +151,42 @@ GPSINAI ::= NAI
 
 NAI ::= UTF8String
 
+LDID ::= UTF8String (SIZE (6..MAX))
+
+InternationalizedEmailAddress ::= UTF8String
+
+EUI64 ::= UTF8String (SIZE (23))
+
+CGI ::= UTF8String (SIZE (16..17))
+
+ECGI ::= UTF8String (SIZE (14..15))
+
+NCGI ::= UTF8String (SIZE (16..17))
+
+ICCID ::= NumericString (SIZE (19..20))
+
 IPProtocol ::= INTEGER (0..255)
 
 VLANID ::= INTEGER (0..4095)
 
+VIN ::= UTF8String (SIZE (17))
+
 ServiceAccessIdentifier ::= UTF8String
 
+EUICCID ::= NumericString (SIZE (32))
+
+APN ::= UTF8String
+
+DNN ::= UTF8String
+
+H323URI ::= UTF8String
+
+IMPU ::= UTF8String
+
+IMPI ::= NAI
+
+VRF ::= UTF8String
+
 Percentage ::= INTEGER (0..100)
 
 AltitudeMeters ::= INTEGER (-1000..50000)
diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd
index e6afc7cd937b9502c57b20ff1d8c21ad7bb8f87c..6197314d85b803ff9eab2ea6141a9d6923ac6b31 100644
--- a/103280/TS_103_280.xsd
+++ b/103280/TS_103_280.xsd
@@ -77,7 +77,7 @@
     </xs:simpleType>
     <xs:simpleType name="IPv6CIDR">
         <xs:restriction base="xs:token">
-            <xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))"/>
+            <xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9]?[0-9])|(1[0-1][0-9])|(12[0-8]))"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:complexType name="IPAddress">