diff --git a/v3_6_0/CDT-AE-v3_6_0.xsd b/v3_6_0/CDT-AE-v3_6_0.xsd
index 396087c15bd568eee51d770285c600ca9ff6b0a1..8a366194de38bfeb896c4521618ccb5ce5acaec1 100644
--- a/v3_6_0/CDT-AE-v3_6_0.xsd
+++ b/v3_6_0/CDT-AE-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-AEContactList-v3_6_0.xsd b/v3_6_0/CDT-AEContactList-v3_6_0.xsd
index e4db7c4f01389d623d2d0e75d9ee61979612329f..7d270deea4868fe7c928f7f01179ad302f3304e3 100644
--- a/v3_6_0/CDT-AEContactList-v3_6_0.xsd
+++ b/v3_6_0/CDT-AEContactList-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_6_0.xsd" />
 
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_6_0/CDT-AEContactListPerCSE-v3_6_0.xsd b/v3_6_0/CDT-AEContactListPerCSE-v3_6_0.xsd
index edb3a022aa5522f30e697d9b7d4bb1dccbc52839..0f7d0306900b30dd6127efdc9315553026505c41 100644
--- a/v3_6_0/CDT-AEContactListPerCSE-v3_6_0.xsd
+++ b/v3_6_0/CDT-AEContactListPerCSE-v3_6_0.xsd
@@ -27,7 +27,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_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-CSEBase-v3_6_0.xsd b/v3_6_0/CDT-CSEBase-v3_6_0.xsd
index dafd804ae7fbd4c453512a55a7b400f38c75c5fa..27059d397a44d388da9583be295fcd0d334408e0 100644
--- a/v3_6_0/CDT-CSEBase-v3_6_0.xsd
+++ b/v3_6_0/CDT-CSEBase-v3_6_0.xsd
@@ -26,33 +26,33 @@ 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_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:include schemaLocation="CDT-AEContactList-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_6_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_6_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_6_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-accessControlPolicy-v3_6_0.xsd b/v3_6_0/CDT-accessControlPolicy-v3_6_0.xsd
index 7fd28aaaaf11339f1fe549387350105142b31417..eebbae9b4e6731008b40badfc99f91188129fb64 100644
--- a/v3_6_0/CDT-accessControlPolicy-v3_6_0.xsd
+++ b/v3_6_0/CDT-accessControlPolicy-v3_6_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_5_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-activeCmdhPolicy-v3_6_0.xsd b/v3_6_0/CDT-activeCmdhPolicy-v3_6_0.xsd
index b766d2ea5916fa01646e066110d07e05bd61c7a7..db5e856b2d7236aaa9401bf055f0154acb1b6b8a 100644
--- a/v3_6_0/CDT-activeCmdhPolicy-v3_6_0.xsd
+++ b/v3_6_0/CDT-activeCmdhPolicy-v3_6_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_5_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_6_0/CDT-allJoynApp-v3_6_0.xsd b/v3_6_0/CDT-allJoynApp-v3_6_0.xsd
index c3517a1c25e85cdad455cd33706f54458cfe5037..d5d9d233e5f6340887e4ca96f6a113522bd81842 100644
--- a/v3_6_0/CDT-allJoynApp-v3_6_0.xsd
+++ b/v3_6_0/CDT-allJoynApp-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_6_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-allJoynInterface-v3_6_0.xsd b/v3_6_0/CDT-allJoynInterface-v3_6_0.xsd
index 1c98f967ac999116739d66be60cd059801049557..9fa28551b5409ce1622de4927b4edcd1c0a129ce 100644
--- a/v3_6_0/CDT-allJoynInterface-v3_6_0.xsd
+++ b/v3_6_0/CDT-allJoynInterface-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_6_0/CDT-allJoynMethod-v3_6_0.xsd b/v3_6_0/CDT-allJoynMethod-v3_6_0.xsd
index 20a22ea5632deb235a6410cc3f31e175d503ac75..46750917c4fb1de61fb3c23aa5a3c02853fe0894 100644
--- a/v3_6_0/CDT-allJoynMethod-v3_6_0.xsd
+++ b/v3_6_0/CDT-allJoynMethod-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_6_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_6_0/CDT-allJoynMethodCall-v3_6_0.xsd b/v3_6_0/CDT-allJoynMethodCall-v3_6_0.xsd
index 59c48159188b661c5bf205c87056fc8f75a54732..cbf32599be0d2d84998275b59196118f9bc1f07c 100644
--- a/v3_6_0/CDT-allJoynMethodCall-v3_6_0.xsd
+++ b/v3_6_0/CDT-allJoynMethodCall-v3_6_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_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-commonTypes-v3_6_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-allJoynProperty-v3_6_0.xsd b/v3_6_0/CDT-allJoynProperty-v3_6_0.xsd
index 5ee2f8a8d058040375356fb781335c631a2dd5c9..33e7fb3ec93d11b37dd3322dea8ff2a93505ca66 100644
--- a/v3_6_0/CDT-allJoynProperty-v3_6_0.xsd
+++ b/v3_6_0/CDT-allJoynProperty-v3_6_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_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-commonTypes-v3_6_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-allJoynSvcObject-v3_6_0.xsd b/v3_6_0/CDT-allJoynSvcObject-v3_6_0.xsd
index 0820eb70979fb570345fe27ac854b5d5713a24fa..6a52618e069881b2600058c8f9dd949dffbea660 100644
--- a/v3_6_0/CDT-allJoynSvcObject-v3_6_0.xsd
+++ b/v3_6_0/CDT-allJoynSvcObject-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_6_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-areaNwkDeviceInfo-v3_6_0.xsd b/v3_6_0/CDT-areaNwkDeviceInfo-v3_6_0.xsd
index ddbfd0fec26dfcad8b730828c8ddf4a302c95a84..643c45bfca816716d97c95db6a781da6d442cc6a 100644
--- a/v3_6_0/CDT-areaNwkDeviceInfo-v3_6_0.xsd
+++ b/v3_6_0/CDT-areaNwkDeviceInfo-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-areaNwkInfo-v3_6_0.xsd b/v3_6_0/CDT-areaNwkInfo-v3_6_0.xsd
index b7d5bebdb70cb339b0e0425cd83608e1569e1d8e..945046314e41646ccb7cafeb0276f398b1478121 100644
--- a/v3_6_0/CDT-areaNwkInfo-v3_6_0.xsd
+++ b/v3_6_0/CDT-areaNwkInfo-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-authorizationDecision-v3_6_0.xsd b/v3_6_0/CDT-authorizationDecision-v3_6_0.xsd
index 31d3eb3c7339a7d803004bdcc3dbacfa9f6c8229..ee39c798a00058d9ae59781d9f8a788107ef87b0 100644
--- a/v3_6_0/CDT-authorizationDecision-v3_6_0.xsd
+++ b/v3_6_0/CDT-authorizationDecision-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-authorizationInformation-v3_6_0.xsd b/v3_6_0/CDT-authorizationInformation-v3_6_0.xsd
index e374faa2f36925017370f282f69dbe249ecc749e..ddfd47e8c221015c078d1d66513c7e27b0ec5e0f 100644
--- a/v3_6_0/CDT-authorizationInformation-v3_6_0.xsd
+++ b/v3_6_0/CDT-authorizationInformation-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_6_0.xsd" />
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-authorizationPolicy-v3_6_0.xsd b/v3_6_0/CDT-authorizationPolicy-v3_6_0.xsd
index 9e46e60d18e3297787a2e5df3aa853949b1139fd..7d426148be76420160911c0bfbc9559ab0a3bbea 100644
--- a/v3_6_0/CDT-authorizationPolicy-v3_6_0.xsd
+++ b/v3_6_0/CDT-authorizationPolicy-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-battery-v3_6_0.xsd b/v3_6_0/CDT-battery-v3_6_0.xsd
index e6fe93a32794508c6ae50c178a215d6728f9d87d..588e928d1c6c0cfd290ffbd2d2c4599357332b82 100644
--- a/v3_6_0/CDT-battery-v3_6_0.xsd
+++ b/v3_6_0/CDT-battery-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-cmdhBuffer-v3_6_0.xsd b/v3_6_0/CDT-cmdhBuffer-v3_6_0.xsd
index 534a36ffca05c6c9c885a241ae8c57d17be628f8..efeb8ac3b0f488e2fde06b635b70761be9cffefb 100644
--- a/v3_6_0/CDT-cmdhBuffer-v3_6_0.xsd
+++ b/v3_6_0/CDT-cmdhBuffer-v3_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_6_0/CDT-cmdhDefEcValue-v3_6_0.xsd b/v3_6_0/CDT-cmdhDefEcValue-v3_6_0.xsd
index 3c2dc5f1e69a9381ab2b3d10ee44779070c564f1..e7a7f2b9a28a45abb260d31769c021f60ac47412 100644
--- a/v3_6_0/CDT-cmdhDefEcValue-v3_6_0.xsd
+++ b/v3_6_0/CDT-cmdhDefEcValue-v3_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_6_0/CDT-cmdhDefaults-v3_6_0.xsd b/v3_6_0/CDT-cmdhDefaults-v3_6_0.xsd
index 04d628d0b605a24ad700bbcbf9bcb11b85e97d4b..edc3f6baefb7a6a01d68410a31399b0c725081c7 100644
--- a/v3_6_0/CDT-cmdhDefaults-v3_6_0.xsd
+++ b/v3_6_0/CDT-cmdhDefaults-v3_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_6_0/CDT-cmdhEcDefParamValues-v3_6_0.xsd b/v3_6_0/CDT-cmdhEcDefParamValues-v3_6_0.xsd
index 8381ccf818b58d5e4f806259f06f7842b59985e5..1c705980613c3bcc9da6669273ef2156b4216631 100644
--- a/v3_6_0/CDT-cmdhEcDefParamValues-v3_6_0.xsd
+++ b/v3_6_0/CDT-cmdhEcDefParamValues-v3_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_6_0/CDT-cmdhLimits-v3_6_0.xsd b/v3_6_0/CDT-cmdhLimits-v3_6_0.xsd
index e0c742f8e65187caae961a7052b7f6b70ffa0934..3526d72f1a879fa496c007f620cd1a4c61f6d4d0 100644
--- a/v3_6_0/CDT-cmdhLimits-v3_6_0.xsd
+++ b/v3_6_0/CDT-cmdhLimits-v3_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_6_0/CDT-cmdhNetworkAccessRules-v3_6_0.xsd b/v3_6_0/CDT-cmdhNetworkAccessRules-v3_6_0.xsd
index 856d36b0a336e6c6999afb5d917ca0176bee0e14..e2adc6b72e63304e56f72b3a6830031be781400c 100644
--- a/v3_6_0/CDT-cmdhNetworkAccessRules-v3_6_0.xsd
+++ b/v3_6_0/CDT-cmdhNetworkAccessRules-v3_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_6_0/CDT-cmdhNwAccessRule-v3_6_0.xsd b/v3_6_0/CDT-cmdhNwAccessRule-v3_6_0.xsd
index 5b43e87c75c53a438e989a582ac8c4621c9d22a4..92fbe7fa11d411916fc83ae0e47efd7558d47c25 100644
--- a/v3_6_0/CDT-cmdhNwAccessRule-v3_6_0.xsd
+++ b/v3_6_0/CDT-cmdhNwAccessRule-v3_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_6_0/CDT-cmdhPolicy-v3_6_0.xsd b/v3_6_0/CDT-cmdhPolicy-v3_6_0.xsd
index 3ebf05bc055987ddc20087e7b9bda50b19bf1ed4..d750a42d63df6486915f0cb0ac43312ed34cedb4 100644
--- a/v3_6_0/CDT-cmdhPolicy-v3_6_0.xsd
+++ b/v3_6_0/CDT-cmdhPolicy-v3_6_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_5_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_6_0/CDT-commonTypes-v3_6_0.xsd b/v3_6_0/CDT-commonTypes-v3_6_0.xsd
index aa75f0a9c78beb260d6d0888445e2de9f6cbf7fd..666666ae7a28e5e48e7121e7587bae92a14256ac 100644
--- a/v3_6_0/CDT-commonTypes-v3_6_0.xsd
+++ b/v3_6_0/CDT-commonTypes-v3_6_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_5_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_6_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_6_0/CDT-container-v3_6_0.xsd b/v3_6_0/CDT-container-v3_6_0.xsd
index 3741c026803b7a527158cd5450d23d47216b6ea2..f908182abaee132e9c2a7cbc1d34baae6104f149 100644
--- a/v3_6_0/CDT-container-v3_6_0.xsd
+++ b/v3_6_0/CDT-container-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_6_0/CDT-contentInstance-v3_6_0.xsd b/v3_6_0/CDT-contentInstance-v3_6_0.xsd
index 7ff1b425ca7cc81d5e433a7a86b3620c3a2859a0..b3bfcc95b8a12a352f1a9f176e87c21fa7f695bd 100644
--- a/v3_6_0/CDT-contentInstance-v3_6_0.xsd
+++ b/v3_6_0/CDT-contentInstance-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-delivery-v3_6_0.xsd b/v3_6_0/CDT-delivery-v3_6_0.xsd
index cbfe665b8221b3c7800f952a2411b917f9372718..12b83797b2484d6d0a5e65bc003ec6f779e15f36 100644
--- a/v3_6_0/CDT-delivery-v3_6_0.xsd
+++ b/v3_6_0/CDT-delivery-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_6_0/CDT-deviceCapability-v3_6_0.xsd b/v3_6_0/CDT-deviceCapability-v3_6_0.xsd
index 52ab6348025bf7ff0c79af84677c52fd16eb4c39..12eb026066dcd37cade1ee0b9c2731862dcfd9bc 100644
--- a/v3_6_0/CDT-deviceCapability-v3_6_0.xsd
+++ b/v3_6_0/CDT-deviceCapability-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-deviceInfo-v3_6_0.xsd b/v3_6_0/CDT-deviceInfo-v3_6_0.xsd
index e1247e4ce22f8ad5272cbea3d2db64b65099d2bb..fa66e7304ffd2870c95a1ed8653c6e5e0295fe57 100644
--- a/v3_6_0/CDT-deviceInfo-v3_6_0.xsd
+++ b/v3_6_0/CDT-deviceInfo-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-dynamicAuthorizationConsultation-v3_6_0.xsd b/v3_6_0/CDT-dynamicAuthorizationConsultation-v3_6_0.xsd
index e5d3184be24a443f01a5be0362090e202d80e46b..5bc511b982d77468cfcac1cc8053d5e0333d3bd6 100644
--- a/v3_6_0/CDT-dynamicAuthorizationConsultation-v3_6_0.xsd
+++ b/v3_6_0/CDT-dynamicAuthorizationConsultation-v3_6_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_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-eventConfig-v3_6_0.xsd b/v3_6_0/CDT-eventConfig-v3_6_0.xsd
index 8836e31f0d0f7df90cda1e5200d6a0ee957e4aaf..6a1c08e60d19f0d12191f0048e4c9abcef1e7429 100644
--- a/v3_6_0/CDT-eventConfig-v3_6_0.xsd
+++ b/v3_6_0/CDT-eventConfig-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-eventLog-v3_6_0.xsd b/v3_6_0/CDT-eventLog-v3_6_0.xsd
index 87a63409defa7f1e1bae0f430fe0a5ba33287384..52c177a75c769bd104165571e072de16fffa24eb 100644
--- a/v3_6_0/CDT-eventLog-v3_6_0.xsd
+++ b/v3_6_0/CDT-eventLog-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-execInstance-v3_6_0.xsd b/v3_6_0/CDT-execInstance-v3_6_0.xsd
index 8e72cf9777a11ca81da77d22c226b640f7041a31..2e03089ae2252bd8b21bb788e3e32202a986e4a8 100644
--- a/v3_6_0/CDT-execInstance-v3_6_0.xsd
+++ b/v3_6_0/CDT-execInstance-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-firmware-v3_6_0.xsd b/v3_6_0/CDT-firmware-v3_6_0.xsd
index cdd303cff581eb27b28f0bb841305db1dc984a6f..0d71c470fade95b80674f3856e806c1038d36c29 100644
--- a/v3_6_0/CDT-firmware-v3_6_0.xsd
+++ b/v3_6_0/CDT-firmware-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-genericInterworkingOperationInstance-v3_6_0.xsd b/v3_6_0/CDT-genericInterworkingOperationInstance-v3_6_0.xsd
index c18643b94122ade96e12661bca8b19b6c779e60d..b571d036cf2bcad8c88666525186ce27f36f6a7f 100644
--- a/v3_6_0/CDT-genericInterworkingOperationInstance-v3_6_0.xsd
+++ b/v3_6_0/CDT-genericInterworkingOperationInstance-v3_6_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_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-commonTypes-v3_6_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-genericInterworkingService-v3_6_0.xsd b/v3_6_0/CDT-genericInterworkingService-v3_6_0.xsd
index 5201ceab6e0ccb7882cf42dc7cbaba17c60e98cc..180f776a70fb38147f03e0d81713291dd378ecd2 100644
--- a/v3_6_0/CDT-genericInterworkingService-v3_6_0.xsd
+++ b/v3_6_0/CDT-genericInterworkingService-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_6_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-group-v3_6_0.xsd b/v3_6_0/CDT-group-v3_6_0.xsd
index 7511d50680ff5aea627d595bab8fc77046aa5d38..b3d35a4498b858454d1eabac71c7ef2b46adcfa0 100644
--- a/v3_6_0/CDT-group-v3_6_0.xsd
+++ b/v3_6_0/CDT-group-v3_6_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_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-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-locationPolicy-v3_6_0.xsd b/v3_6_0/CDT-locationPolicy-v3_6_0.xsd
index c5539a2d3cc641123cd1cd584d621eba6a7d0888..175c325c9eec0e29369f4bfbfd85191a81268c3b 100644
--- a/v3_6_0/CDT-locationPolicy-v3_6_0.xsd
+++ b/v3_6_0/CDT-locationPolicy-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-m2mServiceSubscriptionProfile-v3_6_0.xsd b/v3_6_0/CDT-m2mServiceSubscriptionProfile-v3_6_0.xsd
index 38fe20745168fd494a96f25a9ef5c3440252f6ef..0acf475dd51f81faae2ee6a0d8cbe7eac71fc236 100644
--- a/v3_6_0/CDT-m2mServiceSubscriptionProfile-v3_6_0.xsd
+++ b/v3_6_0/CDT-m2mServiceSubscriptionProfile-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_6_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-memory-v3_6_0.xsd b/v3_6_0/CDT-memory-v3_6_0.xsd
index cd2a6be8db68b7a567edadae99cbee873a0986fd..499842d4a3024b168eadb972377ff297ffb5baac 100644
--- a/v3_6_0/CDT-memory-v3_6_0.xsd
+++ b/v3_6_0/CDT-memory-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-mgmtCmd-v3_6_0.xsd b/v3_6_0/CDT-mgmtCmd-v3_6_0.xsd
index fdf07f5ded3e02c0982c08613ff6890abdec1cad..79632169553e96f01995ddc26cbe80a949a3492a 100644
--- a/v3_6_0/CDT-mgmtCmd-v3_6_0.xsd
+++ b/v3_6_0/CDT-mgmtCmd-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_6_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-node-v3_6_0.xsd b/v3_6_0/CDT-node-v3_6_0.xsd
index 1d565152b85e9a26cf226b3a31fb071581d956e4..81b12f49cc6efab47a44104a24f32c590f5d762a 100644
--- a/v3_6_0/CDT-node-v3_6_0.xsd
+++ b/v3_6_0/CDT-node-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_6_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-notification-v3_6_0.xsd b/v3_6_0/CDT-notification-v3_6_0.xsd
index 9dc0c36f2a7c753702e57ed704fb88ba9d972805..0ea36caff9a5884b2bd7086ae1e2a48906cf40ec 100644
--- a/v3_6_0/CDT-notification-v3_6_0.xsd
+++ b/v3_6_0/CDT-notification-v3_6_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_5_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_5_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_6_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_6_0/CDT-notificationTargetMgmtPolicyRef-v3_6_0.xsd b/v3_6_0/CDT-notificationTargetMgmtPolicyRef-v3_6_0.xsd
index a2cec20253a36d69a638d604d0310a48572bcc38..bd8b7bb5cd96bcb23519c37cdd39309d010f38c0 100644
--- a/v3_6_0/CDT-notificationTargetMgmtPolicyRef-v3_6_0.xsd
+++ b/v3_6_0/CDT-notificationTargetMgmtPolicyRef-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-notificationTargetPolicy-v3_6_0.xsd b/v3_6_0/CDT-notificationTargetPolicy-v3_6_0.xsd
index c0eaf0db301ec67372b92e0ebe7d5552cfb5c615..ee6471891dd7cb7d6325153b1bb22521fd280904 100644
--- a/v3_6_0/CDT-notificationTargetPolicy-v3_6_0.xsd
+++ b/v3_6_0/CDT-notificationTargetPolicy-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-ontology-v3_6_0.xsd b/v3_6_0/CDT-ontology-v3_6_0.xsd
index 2f337d7f475341d02a3e50697b89e24d75e07876..cd7c57ce93ecdc43996df70b7cb73e300f0f9520 100644
--- a/v3_6_0/CDT-ontology-v3_6_0.xsd
+++ b/v3_6_0/CDT-ontology-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_6_0/CDT-ontologyRepository-v3_6_0.xsd b/v3_6_0/CDT-ontologyRepository-v3_6_0.xsd
index d520230bfb4c4783b7b0ff40475826d641091d65..885448a305873024545dc81658465bb6aa042242 100644
--- a/v3_6_0/CDT-ontologyRepository-v3_6_0.xsd
+++ b/v3_6_0/CDT-ontologyRepository-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_6_0.xsd" />
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_6_0/CDT-policyDeletionRules-v3_6_0.xsd b/v3_6_0/CDT-policyDeletionRules-v3_6_0.xsd
index cebf88e1acbb22e6962998c73030529d425471fc..68949e9679455ab39f5a9b4b240c50377bcea4aa 100644
--- a/v3_6_0/CDT-policyDeletionRules-v3_6_0.xsd
+++ b/v3_6_0/CDT-policyDeletionRules-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-pollingChannel-v3_6_0.xsd b/v3_6_0/CDT-pollingChannel-v3_6_0.xsd
index a6fd5b72ae8b1e1ab372b48e3658e0fd08f2d72d..fbf16fd4e7041d165663c7acfea7cb32c3aae80a 100644
--- a/v3_6_0/CDT-pollingChannel-v3_6_0.xsd
+++ b/v3_6_0/CDT-pollingChannel-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-reboot-v3_6_0.xsd b/v3_6_0/CDT-reboot-v3_6_0.xsd
index 6473cf2ce918c12dbf40e6ee465c471e8a48635c..b8b20f30e49d7d5a34b589dfb5ffd56d036579bf 100644
--- a/v3_6_0/CDT-reboot-v3_6_0.xsd
+++ b/v3_6_0/CDT-reboot-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-remoteCSE-v3_6_0.xsd b/v3_6_0/CDT-remoteCSE-v3_6_0.xsd
index 8fc8e8207702a0d35b1a908e17fc3c323305d8fe..69fdbffeb1219aac9f3269f35d4643d7f377bf7d 100644
--- a/v3_6_0/CDT-remoteCSE-v3_6_0.xsd
+++ b/v3_6_0/CDT-remoteCSE-v3_6_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_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" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
 
 
 						
diff --git a/v3_6_0/CDT-request-v3_6_0.xsd b/v3_6_0/CDT-request-v3_6_0.xsd
index b52ab7d770c383fe59e5dfa72fd43e50390e2f02..ab8794db1d34e60d62e2cb87fe8a4949c5c4fbc0 100644
--- a/v3_6_0/CDT-request-v3_6_0.xsd
+++ b/v3_6_0/CDT-request-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-requestPrimitive-v3_6_0.xsd b/v3_6_0/CDT-requestPrimitive-v3_6_0.xsd
index 7c2549b236eb4853d0eba2cb61cd29ce0b2a56b7..fc55db5133fdd3b341b2e65a780aaf0ce21fb3f5 100644
--- a/v3_6_0/CDT-requestPrimitive-v3_6_0.xsd
+++ b/v3_6_0/CDT-requestPrimitive-v3_6_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_5_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_6_0/CDT-responsePrimitive-v3_6_0.xsd b/v3_6_0/CDT-responsePrimitive-v3_6_0.xsd
index 043b5e28d1605b049a8a6e38f7cb318c6566e767..d3ca7f879f8e93b638a4afed0794d5933b20e29c 100644
--- a/v3_6_0/CDT-responsePrimitive-v3_6_0.xsd
+++ b/v3_6_0/CDT-responsePrimitive-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_6_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_6_0/CDT-role-v3_6_0.xsd b/v3_6_0/CDT-role-v3_6_0.xsd
index 5bc2f49e3288132a1e244d826dd9df2ff5690224..b6ad0c843a13de65946c4b97836a1d8361e264f1 100644
--- a/v3_6_0/CDT-role-v3_6_0.xsd
+++ b/v3_6_0/CDT-role-v3_6_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_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-schedule-v3_6_0.xsd b/v3_6_0/CDT-schedule-v3_6_0.xsd
index 39ccf60edb82a061c9f6bf036c07fb60d9e859a1..d68815ae8cb77d13aa299acaeea2f349d9071d0b 100644
--- a/v3_6_0/CDT-schedule-v3_6_0.xsd
+++ b/v3_6_0/CDT-schedule-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-semanticDescriptor-v3_6_0.xsd b/v3_6_0/CDT-semanticDescriptor-v3_6_0.xsd
index 80ffb8a3d3331a2e09d710babb7e4dd3186441e1..7f09add774c116ed8913b433654faf88c42fe0bb 100644
--- a/v3_6_0/CDT-semanticDescriptor-v3_6_0.xsd
+++ b/v3_6_0/CDT-semanticDescriptor-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-semanticMashupInstance-v3_6_0.xsd b/v3_6_0/CDT-semanticMashupInstance-v3_6_0.xsd
index 51a5ec08ffa52d1dd88ddc18b72412fcfa3d9b61..9b4a13662fc33c628f31f8a19e55e83fc6d37f7c 100644
--- a/v3_6_0/CDT-semanticMashupInstance-v3_6_0.xsd
+++ b/v3_6_0/CDT-semanticMashupInstance-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-semanticMashupJobProfile-v3_6_0.xsd b/v3_6_0/CDT-semanticMashupJobProfile-v3_6_0.xsd
index 3d7d6770dce43efdedb17ae0d74e611deb536d6e..ef5ec2688b71447fb8b6352afcaf25e88be7b127 100644
--- a/v3_6_0/CDT-semanticMashupJobProfile-v3_6_0.xsd
+++ b/v3_6_0/CDT-semanticMashupJobProfile-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_5_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-semanticMashupResult-v3_6_0.xsd b/v3_6_0/CDT-semanticMashupResult-v3_6_0.xsd
index 1c81ceacabff3d7287997086d3a3ae0f0ad4b3dd..272411f2bd07cb9b30f45e6d424e4ae83d7e40c9 100644
--- a/v3_6_0/CDT-semanticMashupResult-v3_6_0.xsd
+++ b/v3_6_0/CDT-semanticMashupResult-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-serviceSubscribedAppRule-v3_6_0.xsd b/v3_6_0/CDT-serviceSubscribedAppRule-v3_6_0.xsd
index 967e9a7388a993bafc60c7a7ae401459fd55ee49..06e357aa330ec9e98c1ac8b2b067638e66019814 100644
--- a/v3_6_0/CDT-serviceSubscribedAppRule-v3_6_0.xsd
+++ b/v3_6_0/CDT-serviceSubscribedAppRule-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-serviceSubscribedNode-v3_6_0.xsd b/v3_6_0/CDT-serviceSubscribedNode-v3_6_0.xsd
index 9bebed9d272cc5bcede7cf0736be54ff68ff136b..ff2f06a80216194b001745a3d22fb8c5637657b6 100644
--- a/v3_6_0/CDT-serviceSubscribedNode-v3_6_0.xsd
+++ b/v3_6_0/CDT-serviceSubscribedNode-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-software-v3_6_0.xsd b/v3_6_0/CDT-software-v3_6_0.xsd
index b9c15be2038b6cf274d40abc0c6e64b6decf5c0b..3d0ceb5fc6b6e2d90ebaadf612f5fd4e9e4eef44 100644
--- a/v3_6_0/CDT-software-v3_6_0.xsd
+++ b/v3_6_0/CDT-software-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-statsCollect-v3_6_0.xsd b/v3_6_0/CDT-statsCollect-v3_6_0.xsd
index f7944069837e4251a1d50ce8919cadbd8998d7e6..1a122c0923cbf864a7d02944cac362d1526a2d07 100644
--- a/v3_6_0/CDT-statsCollect-v3_6_0.xsd
+++ b/v3_6_0/CDT-statsCollect-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-statsConfig-v3_6_0.xsd b/v3_6_0/CDT-statsConfig-v3_6_0.xsd
index 2f2ffdfa6332daa1dcb1d61e7cc7c65f335c0577..1eb44a42e8b17f4b71a0333956b2fe6139cbb113 100644
--- a/v3_6_0/CDT-statsConfig-v3_6_0.xsd
+++ b/v3_6_0/CDT-statsConfig-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-subscription-v3_6_0.xsd b/v3_6_0/CDT-subscription-v3_6_0.xsd
index 822f47294f6f571fbb69115b0b29d6dc2b90d23c..7ab098361494280756c3ac392473b58d4a4163cd 100644
--- a/v3_6_0/CDT-subscription-v3_6_0.xsd
+++ b/v3_6_0/CDT-subscription-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_6_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-svcFwWrapper-v3_6_0.xsd b/v3_6_0/CDT-svcFwWrapper-v3_6_0.xsd
index 8571ea3ed1586557a5e67ae474027cf638356277..3f9f8a9560e9d557edb7dffdea2662f3293758f2 100644
--- a/v3_6_0/CDT-svcFwWrapper-v3_6_0.xsd
+++ b/v3_6_0/CDT-svcFwWrapper-v3_6_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_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-commonTypes-v3_6_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-svcObjWrapper-v3_6_0.xsd b/v3_6_0/CDT-svcObjWrapper-v3_6_0.xsd
index 2ddd7d51833130466260a0e4e0bf6d8d6900f025..422114f9d41f251ab498a3f10efe0a3f87d9863b 100644
--- a/v3_6_0/CDT-svcObjWrapper-v3_6_0.xsd
+++ b/v3_6_0/CDT-svcObjWrapper-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_6_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-timeSeries-v3_6_0.xsd b/v3_6_0/CDT-timeSeries-v3_6_0.xsd
index 632a5cbb757900898d6da9df022da17b54af779d..05d79a37a76d7949eff67c70bb420d66350fbab0 100644
--- a/v3_6_0/CDT-timeSeries-v3_6_0.xsd
+++ b/v3_6_0/CDT-timeSeries-v3_6_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_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:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_6_0/CDT-timeSeriesInstance-v3_6_0.xsd b/v3_6_0/CDT-timeSeriesInstance-v3_6_0.xsd
index 02c0580f374ae1d9cc3cfdeebdaff5e6c7a2c8f4..c82566f1256831b5bbac4c43822b3e8f337995d7 100644
--- a/v3_6_0/CDT-timeSeriesInstance-v3_6_0.xsd
+++ b/v3_6_0/CDT-timeSeriesInstance-v3_6_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_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-token-v3_6_0.xsd b/v3_6_0/CDT-token-v3_6_0.xsd
index f78f6f0561d981645f919fe2d199a7400595ed2d..c47ad2829fe4a0790a180611ccb897d3e38aa4b7 100644
--- a/v3_6_0/CDT-token-v3_6_0.xsd
+++ b/v3_6_0/CDT-token-v3_6_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_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_6_0/CDT-trafficPattern-v3_6_0.xsd b/v3_6_0/CDT-trafficPattern-v3_6_0.xsd
index 30b5469cda3346bd21f1493ffcfcbbed85dda124..79e5f13135f6c9364f1459dc2e67a40b2d6eb533 100644
--- a/v3_6_0/CDT-trafficPattern-v3_6_0.xsd
+++ b/v3_6_0/CDT-trafficPattern-v3_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>