diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index d06eb9f7c823c5e9602d2c50f4346ae2002edca1..8055d968c94682bb6da6987035393dc78edd4023 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.8.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID" xmlns:destinationSet="http://uri.etsi.org/03221/X1/2017/10/DestinationSet" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.11.1">
 	<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+	<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"/>
+	<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/DestinationSet"/>
 	<!-- Message containers -->
 	<xs:element name="X1Request" type="RequestContainer"/>
 	<xs:element name="X1Response" type="ResponseContainer"/>
@@ -101,6 +103,11 @@
 			<xs:enumeration value="ReportNEIssue"/>
 			<xs:enumeration value="Ping"/>
 			<xs:enumeration value="Keepalive"/>
+			<xs:enumeration value="CreateObject"/>
+			<xs:enumeration value="ModifyObject"/>
+			<xs:enumeration value="GetObject"/>
+			<xs:enumeration value="DeleteObject"/>
+			<xs:enumeration value="ListObjectsOfType"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:complexType name="ErrorInformation">
@@ -131,6 +138,7 @@
 			<xs:element name="correlationID" type="xs:nonNegativeInteger" minOccurs="0"/>
 			<xs:element name="implicitDeactivationAllowed" type="xs:boolean" minOccurs="0"/>
 			<xs:element name="productID" type="XId" minOccurs="0"/>
+			<xs:element name="listOfServiceTypes" type="ListOfServiceTypes" minOccurs="0"/>
 			<xs:element name="taskDetailsExtensions" type="TaskDetailsExtensions" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
@@ -174,6 +182,8 @@
 			<xs:element name="peiImeisv" type="etsi103280:PEIIMEISV"/>
 			<xs:element name="gpsiMsisdn" type="etsi103280:GPSIMSISDN"/>
 			<xs:element name="gpsiNai" type="etsi103280:GPSINAI"/>
+			<xs:element name="eui64" type="etsi103280:EUI64"/>
+			<xs:element name="hashedIdentifier" type="hashedID:HashedIdentifier"/>
 			<xs:element name="targetIdentifierExtension" type="TargetIdentifierExtension"/>
 		</xs:choice>
 	</xs:complexType>
@@ -628,6 +638,7 @@
 					<xs:element name="neStatusDetails" type="NeStatusDetails"/>
 					<xs:element name="listOfTaskResponseDetails" type="ListOfTaskResponseDetails"/>
 					<xs:element name="listOfDestinationResponseDetails" type="ListOfDestinationResponseDetails"/>
+					<xs:element name="listOfGenericObjectResponseDetails" type="ListOfGenericObjectResponseDetails" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -657,6 +668,7 @@
 				<xs:sequence>
 					<xs:element name="ListOfXIDs" type="ListOfXids"/>
 					<xs:element name="ListOfDIDs" type="ListOfDids"/>
+					<xs:element name="ListOfGenericObjectIDs" type="ListOfGenericObjectIDs" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -789,4 +801,145 @@
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-</xs:schema>
\ No newline at end of file
+	<xs:simpleType name="GenericObjectID">
+		<xs:restriction base="etsi103280:UUID"/>
+	</xs:simpleType>
+	<xs:simpleType name="GenericObjectType">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="Q\{[^{}]*\}.+"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="GenericObject" abstract="true">
+		<xs:sequence>
+			<xs:element name="objectId" type="GenericObjectID"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="CreateObjectRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="createObject" type="GenericObject"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="CreateObjectResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ModifyObjectRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="modifyObject" type="GenericObject"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ModifyObjectResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="GetObjectRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="objectId" type="GenericObjectID"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="GetObjectResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="GenericObjectResponseDetails">
+		<xs:sequence>
+			<xs:element name="object" type="GenericObject"/>
+			<xs:element name="status" type="GenericObjectStatus" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ListOfGenericObjectResponseDetails">
+		<xs:sequence>
+			<xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="GenericObjectStatus">
+		<xs:sequence/>
+	</xs:complexType>
+	<xs:complexType name="DeleteObjectRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="objectId" type="GenericObjectID"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="DeleteObjectResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ListObjectsOfTypeRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="objectType" type="GenericObjectType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ListObjectsOfTypeResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="listOfObjects" type="ListOfGenericObjectIDs"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ListOfGenericObjectIDs">
+		<xs:sequence>
+			<xs:element name="objectId" type="GenericObjectID" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	--
+	<xs:complexType name="DeleteAllObjectsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="objectType" type="GenericObjectType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="DeleteObjectResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+</xs:schema>