diff --git a/TS_103_280.asn1 b/TS_103_280.asn1
index 406dc286292da73589b04107303eb7dc90fec0b2..e1d99366938ccfc001f10996ff10f31083941c00 100644
--- a/TS_103_280.asn1
+++ b/TS_103_280.asn1
@@ -1,14 +1,54 @@
 Common-Parameters
-{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)}
+{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
 
 DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN
 
 -- Object Identifier definitions
 
-commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)}
+commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
 
 -- Common Parameter: LIID (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
+}
+
 END
diff --git a/ts_103280.xsd b/ts_103280.xsd
index a99f0b01fc0fbd39607d9c3bad54abae1bf75da6..23d5c128d2b2d9761c79a8b5270b671ec36d4f53 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/2015/08" targetNamespace="http://uri.etsi.org/03280/common/2015/08" version="1.1.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.1.1" elementFormDefault="qualified">
     <xs:simpleType name="ShortString">
         <xs:restriction base="xs:string">
             <xs:maxLength value="255"/>
@@ -42,7 +42,7 @@
     </xs:simpleType>
     <xs:simpleType name="IMSI">
         <xs:restriction base="xs:token">
-            <xs:pattern value="[0-9]{15}"/>
+            <xs:pattern value="[0-9]{6,15}"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="IMEI">
@@ -80,13 +80,13 @@
             <xs:element name="IPv4Address" type="IPv4Address"/>
             <xs:element name="IPv6Address" type="IPv6Address"/>
         </xs:choice>
-    </xs:complexType> 
+    </xs:complexType>
     <xs:complexType name="IPCIDR">
         <xs:choice>
             <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 +116,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}"/>
@@ -155,4 +155,14 @@
             <xs:pattern value="[A-Z]{2}"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="SIPURI">
+        <xs:restriction base="xs:anyURI">
+            <xs:pattern value="sips?:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="TELURI">
+        <xs:restriction base="xs:anyURI">
+            <xs:pattern value="tel:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>