diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index 733b8c35319ae70e06657e2902074f1a3e129d21..55de5d398325ca06039e3cdde1a96bb9f09c39f3 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -392,6 +392,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction>
 	</xs:simpleType>
 	
+	<xs:simpleType name="locationTargetID">
+		<xs:union>
+			<xs:simpleType>
+				<xs:restriction base='m2m:nodeID' />
+			</xs:simpleType>
+			<xs:simpleType>
+				<xs:restriction base='m2m:externalID' />
+			</xs:simpleType>
+			<xs:simpleType>
+				<xs:restriction base="xs:string" >
+					<xs:pattern value="([0-9]*)" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:union>
+	</xs:simpleType>
+	
 	<!--********************** -->
 	<!-- oneM2M Complex Types -->
 	<!--********************** -->
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index 2f0bffc8c82190fd54586ecb83d03924e037bb0b..06f2b1345832e989130aa520fa36ddc96576862e 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -696,6 +696,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:documentation>This is used for [software], [firmware] resources.</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:integer">
+			<!-- Uninitialzed -->
+			<xs:enumeration value="0" />
 			<!-- Successful -->
 			<xs:enumeration value="1" />
 			<!-- Failure -->
diff --git a/CDT-locationPolicy.xsd b/CDT-locationPolicy.xsd
index 2e24ff1aa6f4cc6ef2a696083db0309744a12ecd..37d7b5f2bb41593d9d86e6eb9d8c9c7bada289fe 100644
--- a/CDT-locationPolicy.xsd
+++ b/CDT-locationPolicy.xsd
@@ -39,7 +39,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<!-- Resource Specific Attributes -->
 						<xs:element name="locationSource" type="m2m:locationSource" />
 						<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
-						<xs:element name="locationTargetID" type="m2m:nodeID" minOccurs="0" />
+						<xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
 						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
@@ -67,7 +67,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<!-- Resource Specific Attributes -->
 						<xs:element name="locationSource" type="m2m:locationSource" minOccurs="0" />
 						<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
-						<xs:element name="locationTargetID" type="m2m:nodeID" minOccurs="0" />
+						<xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
 						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
diff --git a/CDT-request.xsd b/CDT-request.xsd
index cfaafd108eabac4b7770ebfb9c0343c8c95f6d58..7c5e31f21ef30affc8b785c559f21a0e5151431e 100644
--- a/CDT-request.xsd
+++ b/CDT-request.xsd
@@ -44,7 +44,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="originator" type="m2m:ID" />
 						<xs:element name="requestID" type="m2m:requestID" />
 						<xs:element name="metaInformation" type="m2m:metaInformation" />
-						<xs:element name="primitiveContent" type="m2m:primitiveContent" />
+						<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0" />
 						<xs:element name="requestStatus" type="m2m:requestStatus" />
 						<xs:element name="operationResult" type="m2m:operationResult" />
 
diff --git a/CDT-timeSeriesInstance.xsd b/CDT-timeSeriesInstance.xsd
index 75b973d5fc5ccc2e33999e629142f2f469f5c436..aba0689d1b85be1f24eef11abca5abdf12320037 100644
--- a/CDT-timeSeriesInstance.xsd
+++ b/CDT-timeSeriesInstance.xsd
@@ -37,6 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="dataGenerationTime" type="m2m:absRelTimestamp" />
 						<xs:element name="content" type="xs:anySimpleType" />
 						<xs:element name="sequenceNr" type="xs:nonNegativeInteger" minOccurs="0" />
+						<xs:element name="contentSize" type="xs:nonNegativeInteger" />
 
 						<!-- Child Resources -->
 
@@ -54,6 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="dataGenerationTime" type="m2m:absRelTimestamp" minOccurs="0" />
 						<xs:element name="content" type="xs:anySimpleType" minOccurs="0" />
 						<xs:element name="sequenceNr" type="xs:nonNegativeInteger" minOccurs="0" />
+						<xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0" />
 
 						<!-- Child Resources -->
 
diff --git a/CDT-token.xsd b/CDT-token.xsd
index bc09fd599688b052c3d37639c35bae3cce488f81..2ea3a9876dfe4646cffd7126f036519ea000874f 100644
--- a/CDT-token.xsd
+++ b/CDT-token.xsd
@@ -42,15 +42,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="notBefore" type="m2m:timestamp" />
 						<xs:element name="notAfter" type="m2m:timestamp" minOccurs="0"/>
 						<xs:element name="tokenName" type="xs:string" minOccurs="0" />
-						<xs:element name="audience" type="m2m:listOfM2MID" minOccurs="0" /> 
-						
-						<xs:element name="permissions" minOccurs="0">      
-							<xs:complexType>							
-									<xs:sequence> 
-										<xs:element name="permission" type="m2m:tokenPermission" /> 
-									</xs:sequence> 												
-							</xs:complexType>
-						</xs:element>
+						<xs:element name="audience" type="m2m:listOfM2MID" minOccurs="0" /> 						
+						<xs:element name="permissions" type="m2m:tokenPermissions" minOccurs="0" />      
 						<xs:element name="extension" type="xs:string" minOccurs="0" />
 
 						<!-- Child Resources -->