diff --git a/v3_5_0/CDT-AE-v3_5_0.xsd b/v3_5_0/CDT-AE-v3_5_0.xsd
index d1d969c836f0913ea6e4f36580c3e79a91487913..756550fc34f88ba12fec58a50cba66f4e193b7ad 100644
--- a/v3_5_0/CDT-AE-v3_5_0.xsd
+++ b/v3_5_0/CDT-AE-v3_5_0.xsd
@@ -26,17 +26,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_5_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-CSEBase-v3_5_0.xsd b/v3_5_0/CDT-CSEBase-v3_5_0.xsd
index c27716799b8830a80af317629a3e12a99758ef55..c819d120e425dddded163271529413a16b592835 100644
--- a/v3_5_0/CDT-CSEBase-v3_5_0.xsd
+++ b/v3_5_0/CDT-CSEBase-v3_5_0.xsd
@@ -26,32 +26,32 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_4_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_4_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_5_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_5_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_5_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-accessControlPolicy-v3_5_0.xsd b/v3_5_0/CDT-accessControlPolicy-v3_5_0.xsd
index 6f0ad4c04bb6ac063748e02d96d2c722c2ecb7ff..7fd28aaaaf11339f1fe549387350105142b31417 100644
--- a/v3_5_0/CDT-accessControlPolicy-v3_5_0.xsd
+++ b/v3_5_0/CDT-accessControlPolicy-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-activeCmdhPolicy-v3_5_0.xsd b/v3_5_0/CDT-activeCmdhPolicy-v3_5_0.xsd
index 2ac34634e31c780a5c96d09381143114543c5c0c..b766d2ea5916fa01646e066110d07e05bd61c7a7 100644
--- a/v3_5_0/CDT-activeCmdhPolicy-v3_5_0.xsd
+++ b/v3_5_0/CDT-activeCmdhPolicy-v3_5_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-    <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_5_0/CDT-allJoynApp-v3_5_0.xsd b/v3_5_0/CDT-allJoynApp-v3_5_0.xsd
index 476e793296bbbb4b9cbb4652d4c69e59ede7a2bf..c3517a1c25e85cdad455cd33706f54458cfe5037 100644
--- a/v3_5_0/CDT-allJoynApp-v3_5_0.xsd
+++ b/v3_5_0/CDT-allJoynApp-v3_5_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_5_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-allJoynInterface-v3_5_0.xsd b/v3_5_0/CDT-allJoynInterface-v3_5_0.xsd
index 1b247bd4cdb5547cc1a65afa20ff8a572f73982f..1c98f967ac999116739d66be60cd059801049557 100644
--- a/v3_5_0/CDT-allJoynInterface-v3_5_0.xsd
+++ b/v3_5_0/CDT-allJoynInterface-v3_5_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_5_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_5_0/CDT-allJoynMethod-v3_5_0.xsd b/v3_5_0/CDT-allJoynMethod-v3_5_0.xsd
index e58437a4d961717386f4780ba9184b4054bd74b7..20a22ea5632deb235a6410cc3f31e175d503ac75 100644
--- a/v3_5_0/CDT-allJoynMethod-v3_5_0.xsd
+++ b/v3_5_0/CDT-allJoynMethod-v3_5_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_5_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_5_0/CDT-allJoynMethodCall-v3_5_0.xsd b/v3_5_0/CDT-allJoynMethodCall-v3_5_0.xsd
index 16f8cf746ab7f68cea32d4812a3f0d41f49ca728..59c48159188b661c5bf205c87056fc8f75a54732 100644
--- a/v3_5_0/CDT-allJoynMethodCall-v3_5_0.xsd
+++ b/v3_5_0/CDT-allJoynMethodCall-v3_5_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-allJoynProperty-v3_5_0.xsd b/v3_5_0/CDT-allJoynProperty-v3_5_0.xsd
index 4b184f325728b24ef30dd835d08965e2f61c4e5a..5ee2f8a8d058040375356fb781335c631a2dd5c9 100644
--- a/v3_5_0/CDT-allJoynProperty-v3_5_0.xsd
+++ b/v3_5_0/CDT-allJoynProperty-v3_5_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-allJoynSvcObject-v3_5_0.xsd b/v3_5_0/CDT-allJoynSvcObject-v3_5_0.xsd
index 39a496237a978ea755c54af0e78dd39311a2dafb..0820eb70979fb570345fe27ac854b5d5713a24fa 100644
--- a/v3_5_0/CDT-allJoynSvcObject-v3_5_0.xsd
+++ b/v3_5_0/CDT-allJoynSvcObject-v3_5_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_5_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-areaNwkDeviceInfo-v3_5_0.xsd b/v3_5_0/CDT-areaNwkDeviceInfo-v3_5_0.xsd
index af5e06337949f8ef5ce5fbec13f40e55f4aedba2..ddbfd0fec26dfcad8b730828c8ddf4a302c95a84 100644
--- a/v3_5_0/CDT-areaNwkDeviceInfo-v3_5_0.xsd
+++ b/v3_5_0/CDT-areaNwkDeviceInfo-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-areaNwkInfo-v3_5_0.xsd b/v3_5_0/CDT-areaNwkInfo-v3_5_0.xsd
index 94d60e876f1e03fdd404a2e9a81890cee22b5ff9..b7d5bebdb70cb339b0e0425cd83608e1569e1d8e 100644
--- a/v3_5_0/CDT-areaNwkInfo-v3_5_0.xsd
+++ b/v3_5_0/CDT-areaNwkInfo-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-authorizationDecision-v3_5_0.xsd b/v3_5_0/CDT-authorizationDecision-v3_5_0.xsd
index 7706d5079013f1e0573d800751d6b3223b91f6a8..31d3eb3c7339a7d803004bdcc3dbacfa9f6c8229 100644
--- a/v3_5_0/CDT-authorizationDecision-v3_5_0.xsd
+++ b/v3_5_0/CDT-authorizationDecision-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-authorizationInformation-v3_5_0.xsd b/v3_5_0/CDT-authorizationInformation-v3_5_0.xsd
index 66eada97de78cf3e033f54428c5ead269bf55104..e374faa2f36925017370f282f69dbe249ecc749e 100644
--- a/v3_5_0/CDT-authorizationInformation-v3_5_0.xsd
+++ b/v3_5_0/CDT-authorizationInformation-v3_5_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_5_0.xsd" />
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-authorizationPolicy-v3_5_0.xsd b/v3_5_0/CDT-authorizationPolicy-v3_5_0.xsd
index 5697e78ebd964983c2441f389860a1c353f5d0b8..9e46e60d18e3297787a2e5df3aa853949b1139fd 100644
--- a/v3_5_0/CDT-authorizationPolicy-v3_5_0.xsd
+++ b/v3_5_0/CDT-authorizationPolicy-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-battery-v3_5_0.xsd b/v3_5_0/CDT-battery-v3_5_0.xsd
index 0c4e423229d9837f7432367d0e0f623e91e2665d..e6fe93a32794508c6ae50c178a215d6728f9d87d 100644
--- a/v3_5_0/CDT-battery-v3_5_0.xsd
+++ b/v3_5_0/CDT-battery-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-cmdhBuffer-v3_5_0.xsd b/v3_5_0/CDT-cmdhBuffer-v3_5_0.xsd
index 48e1c16a3d74952ad08378d3819b9ea07d291079..534a36ffca05c6c9c885a241ae8c57d17be628f8 100644
--- a/v3_5_0/CDT-cmdhBuffer-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhBuffer-v3_5_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_5_0/CDT-cmdhDefEcValue-v3_5_0.xsd b/v3_5_0/CDT-cmdhDefEcValue-v3_5_0.xsd
index d96cdc99a68b164fc8bff46656005614ccb45924..3c2dc5f1e69a9381ab2b3d10ee44779070c564f1 100644
--- a/v3_5_0/CDT-cmdhDefEcValue-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhDefEcValue-v3_5_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_5_0/CDT-cmdhDefaults-v3_5_0.xsd b/v3_5_0/CDT-cmdhDefaults-v3_5_0.xsd
index 9bb78de7095481a831aada496d503b13167ca44d..04d628d0b605a24ad700bbcbf9bcb11b85e97d4b 100644
--- a/v3_5_0/CDT-cmdhDefaults-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhDefaults-v3_5_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_5_0/CDT-cmdhEcDefParamValues-v3_5_0.xsd b/v3_5_0/CDT-cmdhEcDefParamValues-v3_5_0.xsd
index 363aef1fef71ebdfaca0881dbb769feb74759595..8381ccf818b58d5e4f806259f06f7842b59985e5 100644
--- a/v3_5_0/CDT-cmdhEcDefParamValues-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhEcDefParamValues-v3_5_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_5_0/CDT-cmdhLimits-v3_5_0.xsd b/v3_5_0/CDT-cmdhLimits-v3_5_0.xsd
index 2da567621ce702aa8d45cc6bcca960960cec13ac..e0c742f8e65187caae961a7052b7f6b70ffa0934 100644
--- a/v3_5_0/CDT-cmdhLimits-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhLimits-v3_5_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_5_0/CDT-cmdhNetworkAccessRules-v3_5_0.xsd b/v3_5_0/CDT-cmdhNetworkAccessRules-v3_5_0.xsd
index ac3841083090276f5a2f8c05d48096ba26f4f99c..856d36b0a336e6c6999afb5d917ca0176bee0e14 100644
--- a/v3_5_0/CDT-cmdhNetworkAccessRules-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhNetworkAccessRules-v3_5_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_5_0/CDT-cmdhNwAccessRule-v3_5_0.xsd b/v3_5_0/CDT-cmdhNwAccessRule-v3_5_0.xsd
index 718c1e1da2ad0339a7f72849251346a473b8837a..5b43e87c75c53a438e989a582ac8c4621c9d22a4 100644
--- a/v3_5_0/CDT-cmdhNwAccessRule-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhNwAccessRule-v3_5_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_5_0/CDT-cmdhPolicy-v3_5_0.xsd b/v3_5_0/CDT-cmdhPolicy-v3_5_0.xsd
index 84ecb9391e27fd2ac4664bc399eae8345348cf5c..3ebf05bc055987ddc20087e7b9bda50b19bf1ed4 100644
--- a/v3_5_0/CDT-cmdhPolicy-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhPolicy-v3_5_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_5_0/CDT-commonTypes-v3_5_0.xsd b/v3_5_0/CDT-commonTypes-v3_5_0.xsd
index d7dbee8cbc119b9250443c4773a81b5b2fc1302f..37349ea6f8f2197ee564bfcbc5a66164970450a0 100644
--- a/v3_5_0/CDT-commonTypes-v3_5_0.xsd
+++ b/v3_5_0/CDT-commonTypes-v3_5_0.xsd
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_5_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_5_0/CDT-container-v3_5_0.xsd b/v3_5_0/CDT-container-v3_5_0.xsd
index c241f42b5729c543337a9024f531ee850dc45b83..3741c026803b7a527158cd5450d23d47216b6ea2 100644
--- a/v3_5_0/CDT-container-v3_5_0.xsd
+++ b/v3_5_0/CDT-container-v3_5_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_5_0/CDT-contentInstance-v3_5_0.xsd b/v3_5_0/CDT-contentInstance-v3_5_0.xsd
index 7512f3613748898a870301476f0b109de0d48f9a..7ff1b425ca7cc81d5e433a7a86b3620c3a2859a0 100644
--- a/v3_5_0/CDT-contentInstance-v3_5_0.xsd
+++ b/v3_5_0/CDT-contentInstance-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-delivery-v3_5_0.xsd b/v3_5_0/CDT-delivery-v3_5_0.xsd
index d07d57af4169255c6fbf5ca526df3fffd1a670c6..cbfe665b8221b3c7800f952a2411b917f9372718 100644
--- a/v3_5_0/CDT-delivery-v3_5_0.xsd
+++ b/v3_5_0/CDT-delivery-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_5_0/CDT-deviceCapability-v3_5_0.xsd b/v3_5_0/CDT-deviceCapability-v3_5_0.xsd
index 6f46e34f854ccf167df8b0f1b523f76ce992688e..52ab6348025bf7ff0c79af84677c52fd16eb4c39 100644
--- a/v3_5_0/CDT-deviceCapability-v3_5_0.xsd
+++ b/v3_5_0/CDT-deviceCapability-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-deviceInfo-v3_5_0.xsd b/v3_5_0/CDT-deviceInfo-v3_5_0.xsd
index c5c2132392d7775b9be0143d0dbf3eb44aa1dadc..2fa555ea5b3ccb5004d85cbeb35c9dd108357d75 100644
--- a/v3_5_0/CDT-deviceInfo-v3_5_0.xsd
+++ b/v3_5_0/CDT-deviceInfo-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-dynamicAuthorizationConsultation-v3_5_0.xsd b/v3_5_0/CDT-dynamicAuthorizationConsultation-v3_5_0.xsd
index bbfe29d4a95ad88e9de1a484028721731bbe05f5..e5d3184be24a443f01a5be0362090e202d80e46b 100644
--- a/v3_5_0/CDT-dynamicAuthorizationConsultation-v3_5_0.xsd
+++ b/v3_5_0/CDT-dynamicAuthorizationConsultation-v3_5_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-eventConfig-v3_5_0.xsd b/v3_5_0/CDT-eventConfig-v3_5_0.xsd
index 04bca032e978edf5a7a848c2f91bd31c756f902e..8836e31f0d0f7df90cda1e5200d6a0ee957e4aaf 100644
--- a/v3_5_0/CDT-eventConfig-v3_5_0.xsd
+++ b/v3_5_0/CDT-eventConfig-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-eventLog-v3_5_0.xsd b/v3_5_0/CDT-eventLog-v3_5_0.xsd
index 24c94e1084dd9fb1770219aac24312649eb1c8ef..87a63409defa7f1e1bae0f430fe0a5ba33287384 100644
--- a/v3_5_0/CDT-eventLog-v3_5_0.xsd
+++ b/v3_5_0/CDT-eventLog-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-execInstance-v3_5_0.xsd b/v3_5_0/CDT-execInstance-v3_5_0.xsd
index 6427b4f27dff6483112fc67d54970bc1e3ac597f..8e72cf9777a11ca81da77d22c226b640f7041a31 100644
--- a/v3_5_0/CDT-execInstance-v3_5_0.xsd
+++ b/v3_5_0/CDT-execInstance-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-firmware-v3_5_0.xsd b/v3_5_0/CDT-firmware-v3_5_0.xsd
index 4638cb303374252e6e722f570ec77eaba2bb7948..cdd303cff581eb27b28f0bb841305db1dc984a6f 100644
--- a/v3_5_0/CDT-firmware-v3_5_0.xsd
+++ b/v3_5_0/CDT-firmware-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-genericInterworkingOperationInstance-v3_5_0.xsd b/v3_5_0/CDT-genericInterworkingOperationInstance-v3_5_0.xsd
index 295812cc724c6d13456c8214888ebccf212eb12f..c18643b94122ade96e12661bca8b19b6c779e60d 100644
--- a/v3_5_0/CDT-genericInterworkingOperationInstance-v3_5_0.xsd
+++ b/v3_5_0/CDT-genericInterworkingOperationInstance-v3_5_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-genericInterworkingService-v3_5_0.xsd b/v3_5_0/CDT-genericInterworkingService-v3_5_0.xsd
index bf0b9b43f57599a548ef4397acf11058b84d788c..5201ceab6e0ccb7882cf42dc7cbaba17c60e98cc 100644
--- a/v3_5_0/CDT-genericInterworkingService-v3_5_0.xsd
+++ b/v3_5_0/CDT-genericInterworkingService-v3_5_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_5_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-group-v3_5_0.xsd b/v3_5_0/CDT-group-v3_5_0.xsd
index 1975d82fdd3bec273a5026db2b3e439a3e860bab..7511d50680ff5aea627d595bab8fc77046aa5d38 100644
--- a/v3_5_0/CDT-group-v3_5_0.xsd
+++ b/v3_5_0/CDT-group-v3_5_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-locationPolicy-v3_5_0.xsd b/v3_5_0/CDT-locationPolicy-v3_5_0.xsd
index 0741621a422e06273823f9563acf040386572349..3d9ffb713d95c1b715307981922c432f8fe89574 100644
--- a/v3_5_0/CDT-locationPolicy-v3_5_0.xsd
+++ b/v3_5_0/CDT-locationPolicy-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-m2mServiceSubscriptionProfile-v3_5_0.xsd b/v3_5_0/CDT-m2mServiceSubscriptionProfile-v3_5_0.xsd
index c9c72c8bbfd6ea0e569c5a93df4e17d8bcb1b4da..38fe20745168fd494a96f25a9ef5c3440252f6ef 100644
--- a/v3_5_0/CDT-m2mServiceSubscriptionProfile-v3_5_0.xsd
+++ b/v3_5_0/CDT-m2mServiceSubscriptionProfile-v3_5_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_5_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-memory-v3_5_0.xsd b/v3_5_0/CDT-memory-v3_5_0.xsd
index 1abb2d8112862416e73a554a519e9039aaa08ea1..cd2a6be8db68b7a567edadae99cbee873a0986fd 100644
--- a/v3_5_0/CDT-memory-v3_5_0.xsd
+++ b/v3_5_0/CDT-memory-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-mgmtCmd-v3_5_0.xsd b/v3_5_0/CDT-mgmtCmd-v3_5_0.xsd
index 5bf2761ec03d7649baba5326bad8bd9fc26bcc2b..fdf07f5ded3e02c0982c08613ff6890abdec1cad 100644
--- a/v3_5_0/CDT-mgmtCmd-v3_5_0.xsd
+++ b/v3_5_0/CDT-mgmtCmd-v3_5_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_5_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-node-v3_5_0.xsd b/v3_5_0/CDT-node-v3_5_0.xsd
index 4a5510d641fdef72f9e10e460383c83ce067d9f0..1d565152b85e9a26cf226b3a31fb071581d956e4 100644
--- a/v3_5_0/CDT-node-v3_5_0.xsd
+++ b/v3_5_0/CDT-node-v3_5_0.xsd
@@ -27,22 +27,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_5_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-notification-v3_5_0.xsd b/v3_5_0/CDT-notification-v3_5_0.xsd
index 92c5fac7430e8653c035a01d8cd4f5b3d9f01fdc..80c362adb49dfea149f2cb7a6c84bf5ee89daa14 100644
--- a/v3_5_0/CDT-notification-v3_5_0.xsd
+++ b/v3_5_0/CDT-notification-v3_5_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         targetNamespace="http://www.onem2m.org/xml/protocols"
         xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_4_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_5_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_5_0/CDT-notificationTargetMgmtPolicyRef-v3_5_0.xsd b/v3_5_0/CDT-notificationTargetMgmtPolicyRef-v3_5_0.xsd
index 753567b4537096f2f4bcbb7a924278207327576d..a2cec20253a36d69a638d604d0310a48572bcc38 100644
--- a/v3_5_0/CDT-notificationTargetMgmtPolicyRef-v3_5_0.xsd
+++ b/v3_5_0/CDT-notificationTargetMgmtPolicyRef-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-notificationTargetPolicy-v3_5_0.xsd b/v3_5_0/CDT-notificationTargetPolicy-v3_5_0.xsd
index 1cae66aeba47b00830a748147571392dd8cd9152..c0eaf0db301ec67372b92e0ebe7d5552cfb5c615 100644
--- a/v3_5_0/CDT-notificationTargetPolicy-v3_5_0.xsd
+++ b/v3_5_0/CDT-notificationTargetPolicy-v3_5_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-ontology-v3_5_0.xsd b/v3_5_0/CDT-ontology-v3_5_0.xsd
index 13f5bb00a3221dbab7d40b9b3b75f168dea6c84d..ba3846db1fffb196a4ac4eaa5bb1709bb1a67d99 100644
--- a/v3_5_0/CDT-ontology-v3_5_0.xsd
+++ b/v3_5_0/CDT-ontology-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_5_0/CDT-ontologyRepository-v3_5_0.xsd b/v3_5_0/CDT-ontologyRepository-v3_5_0.xsd
index e205237c1e5480721bde423061d28357209996ce..d520230bfb4c4783b7b0ff40475826d641091d65 100644
--- a/v3_5_0/CDT-ontologyRepository-v3_5_0.xsd
+++ b/v3_5_0/CDT-ontologyRepository-v3_5_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_5_0.xsd" />
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_5_0/CDT-policyDeletionRules-v3_5_0.xsd b/v3_5_0/CDT-policyDeletionRules-v3_5_0.xsd
index c834f99bf2043349e8796d41fa5bbcf7667091cb..cebf88e1acbb22e6962998c73030529d425471fc 100644
--- a/v3_5_0/CDT-policyDeletionRules-v3_5_0.xsd
+++ b/v3_5_0/CDT-policyDeletionRules-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-pollingChannel-v3_5_0.xsd b/v3_5_0/CDT-pollingChannel-v3_5_0.xsd
index 55fc006c6ff532553e743923c9d3b9184e71ee48..a6fd5b72ae8b1e1ab372b48e3658e0fd08f2d72d 100644
--- a/v3_5_0/CDT-pollingChannel-v3_5_0.xsd
+++ b/v3_5_0/CDT-pollingChannel-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-reboot-v3_5_0.xsd b/v3_5_0/CDT-reboot-v3_5_0.xsd
index 72e00360d7748d71b0919844e7cee01c9a77296b..6473cf2ce918c12dbf40e6ee465c471e8a48635c 100644
--- a/v3_5_0/CDT-reboot-v3_5_0.xsd
+++ b/v3_5_0/CDT-reboot-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-remoteCSE-v3_5_0.xsd b/v3_5_0/CDT-remoteCSE-v3_5_0.xsd
index 498f6233cff583d09bd8040d4490c82f5ee87417..bfdd7599d40f6f41b7e3cb35c1c1448cd55fbb09 100644
--- a/v3_5_0/CDT-remoteCSE-v3_5_0.xsd
+++ b/v3_5_0/CDT-remoteCSE-v3_5_0.xsd
@@ -26,20 +26,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_5_0.xsd" />
 
 
 						
diff --git a/v3_5_0/CDT-request-v3_5_0.xsd b/v3_5_0/CDT-request-v3_5_0.xsd
index 7cf8dd48541f5b2d556b36992ba4f882c651840a..b52ab7d770c383fe59e5dfa72fd43e50390e2f02 100644
--- a/v3_5_0/CDT-request-v3_5_0.xsd
+++ b/v3_5_0/CDT-request-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-requestPrimitive-v3_5_0.xsd b/v3_5_0/CDT-requestPrimitive-v3_5_0.xsd
index ae5aaa4026c8108682e6e878103587f3497928da..2b27e66b02b3a4f59bc2e338b35105f1ff488db9 100644
--- a/v3_5_0/CDT-requestPrimitive-v3_5_0.xsd
+++ b/v3_5_0/CDT-requestPrimitive-v3_5_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_5_0/CDT-responsePrimitive-v3_5_0.xsd b/v3_5_0/CDT-responsePrimitive-v3_5_0.xsd
index 59bd64336544619e5cc82c6a8fadcb37f729e482..d3f617822923d70ad0154e1a2379177ba54c07b5 100644
--- a/v3_5_0/CDT-responsePrimitive-v3_5_0.xsd
+++ b/v3_5_0/CDT-responsePrimitive-v3_5_0.xsd
@@ -28,55 +28,55 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_5_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_5_0/CDT-role-v3_5_0.xsd b/v3_5_0/CDT-role-v3_5_0.xsd
index 1e62533b656577dd47982ad969fe652299cf7e8d..5bc2f49e3288132a1e244d826dd9df2ff5690224 100644
--- a/v3_5_0/CDT-role-v3_5_0.xsd
+++ b/v3_5_0/CDT-role-v3_5_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-schedule-v3_5_0.xsd b/v3_5_0/CDT-schedule-v3_5_0.xsd
index 99fc8b75fd13886d10bc59fb97fba7b56f323c18..39ccf60edb82a061c9f6bf036c07fb60d9e859a1 100644
--- a/v3_5_0/CDT-schedule-v3_5_0.xsd
+++ b/v3_5_0/CDT-schedule-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-semanticDescriptor-v3_5_0.xsd b/v3_5_0/CDT-semanticDescriptor-v3_5_0.xsd
index 763da76113f09443446f68bde55cba9cfc822f30..80ffb8a3d3331a2e09d710babb7e4dd3186441e1 100644
--- a/v3_5_0/CDT-semanticDescriptor-v3_5_0.xsd
+++ b/v3_5_0/CDT-semanticDescriptor-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-semanticMashupInstance-v3_5_0.xsd b/v3_5_0/CDT-semanticMashupInstance-v3_5_0.xsd
index 748688b9f6e0794e1e37f9b451a6eb9a5dc68f74..e498e58353dac67f55008f4dca72306e535cd0ca 100644
--- a/v3_5_0/CDT-semanticMashupInstance-v3_5_0.xsd
+++ b/v3_5_0/CDT-semanticMashupInstance-v3_5_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-semanticMashupResult-v3_5_0.xsd b/v3_5_0/CDT-semanticMashupResult-v3_5_0.xsd
index 7042d4004b4c0de91e7484e3d3ad6ca1b6d3ba98..42790dde8a598c3341b2ab216ef3239297eb4d9e 100644
--- a/v3_5_0/CDT-semanticMashupResult-v3_5_0.xsd
+++ b/v3_5_0/CDT-semanticMashupResult-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-serviceSubscribedAppRule-v3_5_0.xsd b/v3_5_0/CDT-serviceSubscribedAppRule-v3_5_0.xsd
index 5b9f894f37e1ae868b1ce1b3133fafb98520c74a..967e9a7388a993bafc60c7a7ae401459fd55ee49 100644
--- a/v3_5_0/CDT-serviceSubscribedAppRule-v3_5_0.xsd
+++ b/v3_5_0/CDT-serviceSubscribedAppRule-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-serviceSubscribedNode-v3_5_0.xsd b/v3_5_0/CDT-serviceSubscribedNode-v3_5_0.xsd
index a8e59d5965f07d6d60a7a2f0268e98cbd1421967..9bebed9d272cc5bcede7cf0736be54ff68ff136b 100644
--- a/v3_5_0/CDT-serviceSubscribedNode-v3_5_0.xsd
+++ b/v3_5_0/CDT-serviceSubscribedNode-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-software-v3_5_0.xsd b/v3_5_0/CDT-software-v3_5_0.xsd
index 887eaf8e681476e7a8f29ae993bdb0be543ea5d0..b9c15be2038b6cf274d40abc0c6e64b6decf5c0b 100644
--- a/v3_5_0/CDT-software-v3_5_0.xsd
+++ b/v3_5_0/CDT-software-v3_5_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-statsCollect-v3_5_0.xsd b/v3_5_0/CDT-statsCollect-v3_5_0.xsd
index e5a2f714dbf2379c4cfcc8882ed6abcb220c2848..f7944069837e4251a1d50ce8919cadbd8998d7e6 100644
--- a/v3_5_0/CDT-statsCollect-v3_5_0.xsd
+++ b/v3_5_0/CDT-statsCollect-v3_5_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-statsConfig-v3_5_0.xsd b/v3_5_0/CDT-statsConfig-v3_5_0.xsd
index 238f7ea82eb69dbbe4c87701d3e7d63fba2bb9e5..2f2ffdfa6332daa1dcb1d61e7cc7c65f335c0577 100644
--- a/v3_5_0/CDT-statsConfig-v3_5_0.xsd
+++ b/v3_5_0/CDT-statsConfig-v3_5_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-subscription-v3_5_0.xsd b/v3_5_0/CDT-subscription-v3_5_0.xsd
index 30f5d70ff8c940c20c20a5866a84c64bf8eae31a..fa97b8b63408e9e2d7c5014cbec9401cf6bbf196 100644
--- a/v3_5_0/CDT-subscription-v3_5_0.xsd
+++ b/v3_5_0/CDT-subscription-v3_5_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_5_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-svcFwWrapper-v3_5_0.xsd b/v3_5_0/CDT-svcFwWrapper-v3_5_0.xsd
index 2fd9f2d3b3cc75da01a88daa385661b6627481f7..8571ea3ed1586557a5e67ae474027cf638356277 100644
--- a/v3_5_0/CDT-svcFwWrapper-v3_5_0.xsd
+++ b/v3_5_0/CDT-svcFwWrapper-v3_5_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-svcObjWrapper-v3_5_0.xsd b/v3_5_0/CDT-svcObjWrapper-v3_5_0.xsd
index 83f3929c11f0c08e56493533cb25abac10c1bcc5..2ddd7d51833130466260a0e4e0bf6d8d6900f025 100644
--- a/v3_5_0/CDT-svcObjWrapper-v3_5_0.xsd
+++ b/v3_5_0/CDT-svcObjWrapper-v3_5_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_5_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-timeSeries-v3_5_0.xsd b/v3_5_0/CDT-timeSeries-v3_5_0.xsd
index af6cb7c8c1c1aa530d0e726c6bfee270c7b1747d..a317fbb42b0dd0f6b4a0ff5a18ecf60055afd0d1 100644
--- a/v3_5_0/CDT-timeSeries-v3_5_0.xsd
+++ b/v3_5_0/CDT-timeSeries-v3_5_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_5_0/CDT-timeSeriesInstance-v3_5_0.xsd b/v3_5_0/CDT-timeSeriesInstance-v3_5_0.xsd
index a68b61ffa23488c67e90c158609ec2c944c603b4..02c0580f374ae1d9cc3cfdeebdaff5e6c7a2c8f4 100644
--- a/v3_5_0/CDT-timeSeriesInstance-v3_5_0.xsd
+++ b/v3_5_0/CDT-timeSeriesInstance-v3_5_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-token-v3_5_0.xsd b/v3_5_0/CDT-token-v3_5_0.xsd
index ec833bf32bc000f98b0415667ae120e4e2cc6e88..f78f6f0561d981645f919fe2d199a7400595ed2d 100644
--- a/v3_5_0/CDT-token-v3_5_0.xsd
+++ b/v3_5_0/CDT-token-v3_5_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-trafficPattern-v3_5_0.xsd b/v3_5_0/CDT-trafficPattern-v3_5_0.xsd
index 12af7f7a6cd9822ca0719e660a7a88dbba1e8b48..30b5469cda3346bd21f1493ffcfcbbed85dda124 100644
--- a/v3_5_0/CDT-trafficPattern-v3_5_0.xsd
+++ b/v3_5_0/CDT-trafficPattern-v3_5_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>