diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index 212c45be5a20eb96e1a71df7f304795c272b0f7b..2126a60089e10280ec7a19b61f2d4cfb094d13eb 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -376,7 +376,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<xs:simpleType name="descriptorRepresentation">
 		<xs:restriction base="xs:string">
-			<xs:pattern value="application\/rdf\+xml\:1" />
+			<xs:pattern value="application/rdf\+xml:1" />
 		</xs:restriction>
 	</xs:simpleType>
 	
@@ -443,7 +443,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	<xs:complexType name="metaInformation">
 		<xs:sequence>
 			<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
-			<xs:element name="name" type="xs:NCName" minOccurs="0" />
 			<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="requestExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
 			<xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
@@ -501,7 +500,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="authorSignIndicator" type="xs:boolean" minOccurs="0"/>
 			<xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0"/>
 			<xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="originator" type="m2m:ID" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 
@@ -527,6 +525,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="labels" type="m2m:labels" minOccurs="0" />
+			<xs:element name="labelsQuery" type="xs:string" minOccurs="0" />
 			<xs:element name="resourceType" type="m2m:resourceTypeList" minOccurs="0" />
 			<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
 			<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
@@ -1104,7 +1103,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	<xs:complexType name="dynAuthRelMapRequest">
 		<xs:sequence>
 			<xs:element name="originator" type="m2m:ID" minOccurs="0" />
-			<xs:element name="tokenIDs" minOccurs="1" >
+			<xs:element name="tokenIDs" minOccurs="0" >
 				<xs:simpleType>
 					<xs:restriction> 
 						<xs:simpleType> 
@@ -1131,7 +1130,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<xs:complexType name="dynAuthRelMapResponse">
 		<xs:sequence>
-			<xs:element name="tokenIDs" minOccurs="1" >
+			<xs:element name="tokenIDs" minOccurs="0" >
 				<xs:simpleType>
 					<xs:restriction> 
 						<xs:simpleType> 
@@ -1152,7 +1151,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				</xs:simpleType>
 			</xs:element>		
 			<xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" />
-			<xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0" />
+			<xs:element name="signature" type="m2m:signatureList" minOccurs="0" />
 		</xs:sequence>
 	</xs:complexType>
 	
diff --git a/CDT-subscription.xsd b/CDT-subscription.xsd
index 4da487df8b8ba2ce6cd2264f6168d0c3ba514cdb..5635689edeb21215404b9a7383d4c9ff937ac01c 100644
--- a/CDT-subscription.xsd
+++ b/CDT-subscription.xsd
@@ -81,7 +81,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
 			<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
-			<xs:element name="operationMonitor" type="m2m:operationMonitor" minOccurs="0" maxOccurs="unbounded" />
+			<xs:element name="operationMonitor" type="m2m:operationMonitor" minOccurs="0" maxOccurs="5" />
 			<xs:element name="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" />
 			<xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
 			<xs:element name="missingData" type="m2m:missingData" minOccurs="0" />