diff --git a/v2_35_0/CDT-AE-v2_35_0.xsd b/v2_35_0/CDT-AE-v2_35_0.xsd
index 3797dd84feeacfe5dc05b87b84da872268b67fac..cf5473b8e478da95078b1ec44004e7ace570302f 100644
--- a/v2_35_0/CDT-AE-v2_35_0.xsd
+++ b/v2_35_0/CDT-AE-v2_35_0.xsd
@@ -26,16 +26,16 @@ 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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_35_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-CSEBase-v2_35_0.xsd b/v2_35_0/CDT-CSEBase-v2_35_0.xsd
index 8ebfb85426fea02e601cbfd642c2f38f595b6831..2d88d2ef722cc3ebce4d87488afb4dd6473a062a 100644
--- a/v2_35_0/CDT-CSEBase-v2_35_0.xsd
+++ b/v2_35_0/CDT-CSEBase-v2_35_0.xsd
@@ -26,26 +26,26 @@ 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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_34_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_34_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_35_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v2_35_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v2_35_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-accessControlPolicy-v2_35_0.xsd b/v2_35_0/CDT-accessControlPolicy-v2_35_0.xsd
index dc0099d7e6d417064f065ddf06818354410c25fd..45eeb379ec2813a16056fd2f36a4736fa55b7946 100644
--- a/v2_35_0/CDT-accessControlPolicy-v2_35_0.xsd
+++ b/v2_35_0/CDT-accessControlPolicy-v2_35_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-v2_34_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-activeCmdhPolicy-v2_35_0.xsd b/v2_35_0/CDT-activeCmdhPolicy-v2_35_0.xsd
index 907ddf1869bdf1eda5a210af060414c1f2e55937..92d921a7c07e9e56a2b7d9aabcb0f4418a6ec6da 100644
--- a/v2_35_0/CDT-activeCmdhPolicy-v2_35_0.xsd
+++ b/v2_35_0/CDT-activeCmdhPolicy-v2_35_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-v2_34_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_35_0/CDT-allJoynApp-v2_35_0.xsd b/v2_35_0/CDT-allJoynApp-v2_35_0.xsd
index 872994190f9e2a41c96ed01696de84e951b803ff..c5bdb41cff1989bc63b9f51b40957df289893c00 100644
--- a/v2_35_0/CDT-allJoynApp-v2_35_0.xsd
+++ b/v2_35_0/CDT-allJoynApp-v2_35_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-v2_34_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_35_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-allJoynInterface-v2_35_0.xsd b/v2_35_0/CDT-allJoynInterface-v2_35_0.xsd
index 0909f4fd99b46580a3a6035e65ef5445e4a4a057..7249e77e4d828b15596509d6bfa880c2da5e1542 100644
--- a/v2_35_0/CDT-allJoynInterface-v2_35_0.xsd
+++ b/v2_35_0/CDT-allJoynInterface-v2_35_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-v2_34_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_35_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_35_0/CDT-allJoynMethod-v2_35_0.xsd b/v2_35_0/CDT-allJoynMethod-v2_35_0.xsd
index ad960237bede6c3fa4ca1665c18bea5d79b052b3..f82fce956441a1166d5147447b4422ab8bbcf27c 100644
--- a/v2_35_0/CDT-allJoynMethod-v2_35_0.xsd
+++ b/v2_35_0/CDT-allJoynMethod-v2_35_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-v2_34_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_35_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_35_0/CDT-allJoynMethodCall-v2_35_0.xsd b/v2_35_0/CDT-allJoynMethodCall-v2_35_0.xsd
index 9ec97ad2e9fa76ee8119c0b1562d843669bdcb3a..24d0c461cbd84a6970777c51a51f06d9db51f7bc 100644
--- a/v2_35_0/CDT-allJoynMethodCall-v2_35_0.xsd
+++ b/v2_35_0/CDT-allJoynMethodCall-v2_35_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-v2_34_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-allJoynProperty-v2_35_0.xsd b/v2_35_0/CDT-allJoynProperty-v2_35_0.xsd
index 8009f4b80ecfdcc5b4f8c2bd21bf436c38bc2604..e0adbbb5374d798d16ab74c0164112def7062c8d 100644
--- a/v2_35_0/CDT-allJoynProperty-v2_35_0.xsd
+++ b/v2_35_0/CDT-allJoynProperty-v2_35_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-v2_34_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-allJoynSvcObject-v2_35_0.xsd b/v2_35_0/CDT-allJoynSvcObject-v2_35_0.xsd
index 45ba0f17a2e467f520c859a241386fb633fe2686..20a177bf276fb666552a3133d7074a37e9c408c2 100644
--- a/v2_35_0/CDT-allJoynSvcObject-v2_35_0.xsd
+++ b/v2_35_0/CDT-allJoynSvcObject-v2_35_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-v2_34_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v2_35_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-areaNwkDeviceInfo-v2_35_0.xsd b/v2_35_0/CDT-areaNwkDeviceInfo-v2_35_0.xsd
index 3756e8fba7268529faff8309509cdf7abf70b403..45add7aa8a0ce0e7cee9a5a83fc08bd74f54d526 100644
--- a/v2_35_0/CDT-areaNwkDeviceInfo-v2_35_0.xsd
+++ b/v2_35_0/CDT-areaNwkDeviceInfo-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-areaNwkInfo-v2_35_0.xsd b/v2_35_0/CDT-areaNwkInfo-v2_35_0.xsd
index 1122ef8494c904dccb99b19ac0700b55bba86b50..0c0db17bad41901d2d4968fcf8d4531d41874fa0 100644
--- a/v2_35_0/CDT-areaNwkInfo-v2_35_0.xsd
+++ b/v2_35_0/CDT-areaNwkInfo-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-battery-v2_35_0.xsd b/v2_35_0/CDT-battery-v2_35_0.xsd
index 9a2766d2fe50fda21a9667a69104c1cb4d0393c8..86f7f1408c89a9c444578accb0bf4b2a4217d90e 100644
--- a/v2_35_0/CDT-battery-v2_35_0.xsd
+++ b/v2_35_0/CDT-battery-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-cmdhBuffer-v2_35_0.xsd b/v2_35_0/CDT-cmdhBuffer-v2_35_0.xsd
index bbe577a9856231161849c23b3e50b3f4cc38c91a..8a7c8113271f0ad88135cfb91a4a275f87780c91 100644
--- a/v2_35_0/CDT-cmdhBuffer-v2_35_0.xsd
+++ b/v2_35_0/CDT-cmdhBuffer-v2_35_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-v2_34_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_35_0/CDT-cmdhDefEcValue-v2_35_0.xsd b/v2_35_0/CDT-cmdhDefEcValue-v2_35_0.xsd
index 8e6ad084a65d9a59ce9f6fae957a18fd276d8878..f462e26690b73afe6bc6b22a642a008f2702c6a4 100644
--- a/v2_35_0/CDT-cmdhDefEcValue-v2_35_0.xsd
+++ b/v2_35_0/CDT-cmdhDefEcValue-v2_35_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-v2_34_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_35_0/CDT-cmdhDefaults-v2_35_0.xsd b/v2_35_0/CDT-cmdhDefaults-v2_35_0.xsd
index ba38203a8a7b5eb7d5134a5035ede374bc05d840..f7947ef565da6941d0e99ccd30b536a8e3637bb4 100644
--- a/v2_35_0/CDT-cmdhDefaults-v2_35_0.xsd
+++ b/v2_35_0/CDT-cmdhDefaults-v2_35_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-v2_34_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_35_0/CDT-cmdhEcDefParamValues-v2_35_0.xsd b/v2_35_0/CDT-cmdhEcDefParamValues-v2_35_0.xsd
index 1afaa6b640bcdf65f17ee613f058f9991724163a..cd609c3cfa8312e188e5990e7b2e6bfd7075d62a 100644
--- a/v2_35_0/CDT-cmdhEcDefParamValues-v2_35_0.xsd
+++ b/v2_35_0/CDT-cmdhEcDefParamValues-v2_35_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-v2_34_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_35_0/CDT-cmdhLimits-v2_35_0.xsd b/v2_35_0/CDT-cmdhLimits-v2_35_0.xsd
index 1b63356a0c1e8edc61db375f531ea646fb0117bc..c2c2826b86459226ddf13f5ffd9312f5909fbcda 100644
--- a/v2_35_0/CDT-cmdhLimits-v2_35_0.xsd
+++ b/v2_35_0/CDT-cmdhLimits-v2_35_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-v2_34_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_35_0/CDT-cmdhNetworkAccessRules-v2_35_0.xsd b/v2_35_0/CDT-cmdhNetworkAccessRules-v2_35_0.xsd
index 2ba7136e2d803bc9499b54691d4c25c8daf79b60..586324f7012dd185782972233d42e3b678f1b58b 100644
--- a/v2_35_0/CDT-cmdhNetworkAccessRules-v2_35_0.xsd
+++ b/v2_35_0/CDT-cmdhNetworkAccessRules-v2_35_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-v2_34_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_35_0/CDT-cmdhNwAccessRule-v2_35_0.xsd b/v2_35_0/CDT-cmdhNwAccessRule-v2_35_0.xsd
index cea33a6ae525a387a26c8458687000a5a2f87459..69f0742b53cd96ccfd6cf476779aadb7c36abc93 100644
--- a/v2_35_0/CDT-cmdhNwAccessRule-v2_35_0.xsd
+++ b/v2_35_0/CDT-cmdhNwAccessRule-v2_35_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-v2_34_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_35_0/CDT-cmdhPolicy-v2_35_0.xsd b/v2_35_0/CDT-cmdhPolicy-v2_35_0.xsd
index 1fa94b6a19d58e6fde22678a31eb77b17408a6a1..62b6a1a682283b89abe39377efa4e6e3f942155e 100644
--- a/v2_35_0/CDT-cmdhPolicy-v2_35_0.xsd
+++ b/v2_35_0/CDT-cmdhPolicy-v2_35_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-v2_34_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_35_0/CDT-commonTypes-v2_35_0.xsd b/v2_35_0/CDT-commonTypes-v2_35_0.xsd
index d7f2aaa5f783c988e37a61068036c3eb7089b213..ae0a7953acf4bba6d15af99c76d113a6385515d9 100644
--- a/v2_35_0/CDT-commonTypes-v2_35_0.xsd
+++ b/v2_35_0/CDT-commonTypes-v2_35_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-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_35_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_35_0/CDT-container-v2_35_0.xsd b/v2_35_0/CDT-container-v2_35_0.xsd
index 4f57335f2c177869b0f899a392492fce617fe53b..0e0a8a819acaf6305d26f7f9b6c17dad2ce48ab7 100644
--- a/v2_35_0/CDT-container-v2_35_0.xsd
+++ b/v2_35_0/CDT-container-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_35_0/CDT-contentInstance-v2_35_0.xsd b/v2_35_0/CDT-contentInstance-v2_35_0.xsd
index b43aa406d68e0c94854a89395eb0727f889695a7..979321df317eeec14730c5f57dc4cd935019d882 100644
--- a/v2_35_0/CDT-contentInstance-v2_35_0.xsd
+++ b/v2_35_0/CDT-contentInstance-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-delivery-v2_35_0.xsd b/v2_35_0/CDT-delivery-v2_35_0.xsd
index 12cbc65d13a611b044a3ebf80329d75c79dc0c80..5974ef3b19b7c9ee15d5c96d039f563accce7489 100644
--- a/v2_35_0/CDT-delivery-v2_35_0.xsd
+++ b/v2_35_0/CDT-delivery-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_35_0/CDT-deviceCapability-v2_35_0.xsd b/v2_35_0/CDT-deviceCapability-v2_35_0.xsd
index 7d5c4231a1938af4a45b11edd7ad467c7333ae44..54ec1cde2bf330b4539117b10399f46916dec229 100644
--- a/v2_35_0/CDT-deviceCapability-v2_35_0.xsd
+++ b/v2_35_0/CDT-deviceCapability-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-deviceInfo-v2_35_0.xsd b/v2_35_0/CDT-deviceInfo-v2_35_0.xsd
index d7703b18487d216284b8ce8b21e6191d8d833c4e..b79f266d427dfcd8ed0fa66326c546d8bb1bb29c 100644
--- a/v2_35_0/CDT-deviceInfo-v2_35_0.xsd
+++ b/v2_35_0/CDT-deviceInfo-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-dynamicAuthorizationConsultation-v2_35_0.xsd b/v2_35_0/CDT-dynamicAuthorizationConsultation-v2_35_0.xsd
index 43c6f618503ed5c81ecef6bbef3fdfd622336685..a6662942f8b02753df95b21919396730c6cd6d3c 100644
--- a/v2_35_0/CDT-dynamicAuthorizationConsultation-v2_35_0.xsd
+++ b/v2_35_0/CDT-dynamicAuthorizationConsultation-v2_35_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-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-eventConfig-v2_35_0.xsd b/v2_35_0/CDT-eventConfig-v2_35_0.xsd
index 35bd3cbc70576f5bffb3a1fcbee600c6cea42487..5cafa2b073dcc386c92aa950ed97081a920e201a 100644
--- a/v2_35_0/CDT-eventConfig-v2_35_0.xsd
+++ b/v2_35_0/CDT-eventConfig-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-eventLog-v2_35_0.xsd b/v2_35_0/CDT-eventLog-v2_35_0.xsd
index fb2c1ce49786edf86c8cb5518757f8e5ec643eb5..d2a35d0e4196554a4a70d9d12d84ec425933b233 100644
--- a/v2_35_0/CDT-eventLog-v2_35_0.xsd
+++ b/v2_35_0/CDT-eventLog-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-execInstance-v2_35_0.xsd b/v2_35_0/CDT-execInstance-v2_35_0.xsd
index a0dc2e9bcf080a403785175f95071e9bf1512be5..2225605d993623f8859f7082ae52402ab2171594 100644
--- a/v2_35_0/CDT-execInstance-v2_35_0.xsd
+++ b/v2_35_0/CDT-execInstance-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-firmware-v2_35_0.xsd b/v2_35_0/CDT-firmware-v2_35_0.xsd
index 07bdd21c8d1818d43efef5f1452df37607937ea2..bc9c68f4b401f9794c8f63fcf5ca863343567ebf 100644
--- a/v2_35_0/CDT-firmware-v2_35_0.xsd
+++ b/v2_35_0/CDT-firmware-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-genericInterworkingOperationInstance-v2_35_0.xsd b/v2_35_0/CDT-genericInterworkingOperationInstance-v2_35_0.xsd
index e9733def320ce466add13274ff68d358a2e100a4..e44ff1ac4192648a9ec80cd4bc98160f80589da0 100644
--- a/v2_35_0/CDT-genericInterworkingOperationInstance-v2_35_0.xsd
+++ b/v2_35_0/CDT-genericInterworkingOperationInstance-v2_35_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-v2_34_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-genericInterworkingService-v2_35_0.xsd b/v2_35_0/CDT-genericInterworkingService-v2_35_0.xsd
index 8387e379f2ae699f758733e86a71e15d85e99559..d7b1273f37a380a706b2a8e7e6d3536cc2081cdb 100644
--- a/v2_35_0/CDT-genericInterworkingService-v2_35_0.xsd
+++ b/v2_35_0/CDT-genericInterworkingService-v2_35_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-v2_34_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_35_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-group-v2_35_0.xsd b/v2_35_0/CDT-group-v2_35_0.xsd
index ec3524b333b6d7844464384167c6ffaf16089903..7ddad69d267bed541d2ca8a6a69cacc513cb085f 100644
--- a/v2_35_0/CDT-group-v2_35_0.xsd
+++ b/v2_35_0/CDT-group-v2_35_0.xsd
@@ -29,9 +29,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_34_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd"/>
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-locationPolicy-v2_35_0.xsd b/v2_35_0/CDT-locationPolicy-v2_35_0.xsd
index fb134a1bf18f99bc77bacb2367fe4bf3da862ebd..6c2b012a354930d8e7337ed895d3399b3df349b1 100644
--- a/v2_35_0/CDT-locationPolicy-v2_35_0.xsd
+++ b/v2_35_0/CDT-locationPolicy-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-m2mServiceSubscriptionProfile-v2_35_0.xsd b/v2_35_0/CDT-m2mServiceSubscriptionProfile-v2_35_0.xsd
index 265081ad5783ccae58e18ea6ba36f60d2064ee0c..798b818c2f73ba1fdd55f00c6d14bb12f8eef28c 100644
--- a/v2_35_0/CDT-m2mServiceSubscriptionProfile-v2_35_0.xsd
+++ b/v2_35_0/CDT-m2mServiceSubscriptionProfile-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_35_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-memory-v2_35_0.xsd b/v2_35_0/CDT-memory-v2_35_0.xsd
index aab2ab210d74a4c17ff0e66f195378bbaff18dca..648aa387d2908b318b13bb1a98337feec21cc058 100644
--- a/v2_35_0/CDT-memory-v2_35_0.xsd
+++ b/v2_35_0/CDT-memory-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-mgmtCmd-v2_35_0.xsd b/v2_35_0/CDT-mgmtCmd-v2_35_0.xsd
index 8bc0a949f00908fe92731317ac480c8a62295e8e..92089c84054dd1e3e0518406360ebd7cee16cd76 100644
--- a/v2_35_0/CDT-mgmtCmd-v2_35_0.xsd
+++ b/v2_35_0/CDT-mgmtCmd-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_35_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-node-v2_35_0.xsd b/v2_35_0/CDT-node-v2_35_0.xsd
index 16ba4ed92b54f46e18bd305aef150615f171e58b..1a0da1eb6aba273992ff1b1d2356e0fd7e908627 100644
--- a/v2_35_0/CDT-node-v2_35_0.xsd
+++ b/v2_35_0/CDT-node-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_35_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-notification-v2_35_0.xsd b/v2_35_0/CDT-notification-v2_35_0.xsd
index 8e7d6afb04eea7ffb05aff5da0392b740485ea99..ad18900d17d22ad4399f984248a76eb14a3f9718 100644
--- a/v2_35_0/CDT-notification-v2_35_0.xsd
+++ b/v2_35_0/CDT-notification-v2_35_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-v2_34_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_34_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_35_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_35_0/CDT-notificationTargetMgmtPolicyRef-v2_35_0.xsd b/v2_35_0/CDT-notificationTargetMgmtPolicyRef-v2_35_0.xsd
index f51761f124e0005c04ba50dbcc08fa03d5c18f10..8ed5a065f044b835a0293b40505d95d99bfb6d80 100644
--- a/v2_35_0/CDT-notificationTargetMgmtPolicyRef-v2_35_0.xsd
+++ b/v2_35_0/CDT-notificationTargetMgmtPolicyRef-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-notificationTargetPolicy-v2_35_0.xsd b/v2_35_0/CDT-notificationTargetPolicy-v2_35_0.xsd
index da5f543ca086c1b5f677427c775c5ae354f22dac..c53105286bcc3c4a7e71e80bdb8973439a28629f 100644
--- a/v2_35_0/CDT-notificationTargetPolicy-v2_35_0.xsd
+++ b/v2_35_0/CDT-notificationTargetPolicy-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-policyDeletionRules-v2_35_0.xsd b/v2_35_0/CDT-policyDeletionRules-v2_35_0.xsd
index 9f0ae862302e5677d42693ea83d5769fcfdda6f8..f5c85a2890bed6990edeb1a2191e180412505387 100644
--- a/v2_35_0/CDT-policyDeletionRules-v2_35_0.xsd
+++ b/v2_35_0/CDT-policyDeletionRules-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-pollingChannel-v2_35_0.xsd b/v2_35_0/CDT-pollingChannel-v2_35_0.xsd
index 5249b0fb145bba922d47117d71ca45ba39139f00..bcb11f879275bcdb4c89519b1b09cf94c92f2e37 100644
--- a/v2_35_0/CDT-pollingChannel-v2_35_0.xsd
+++ b/v2_35_0/CDT-pollingChannel-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-reboot-v2_35_0.xsd b/v2_35_0/CDT-reboot-v2_35_0.xsd
index 9476064cdc92bce64f8c752dcda59bee9a1fade4..606b1639a5be2899e650a7d6a6f12194065905d6 100644
--- a/v2_35_0/CDT-reboot-v2_35_0.xsd
+++ b/v2_35_0/CDT-reboot-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-remoteCSE-v2_35_0.xsd b/v2_35_0/CDT-remoteCSE-v2_35_0.xsd
index b6c25599c7ae645467565571011fa5b716168c15..c274c2a75c729208f8c81e069de526d600c81f8e 100644
--- a/v2_35_0/CDT-remoteCSE-v2_35_0.xsd
+++ b/v2_35_0/CDT-remoteCSE-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_35_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-request-v2_35_0.xsd b/v2_35_0/CDT-request-v2_35_0.xsd
index 991da0b191e55761a90f5e9012c1a43065c03ac5..9635f707fcee0e9eb82a4f0d546c86ce0d1c8ebb 100644
--- a/v2_35_0/CDT-request-v2_35_0.xsd
+++ b/v2_35_0/CDT-request-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-requestPrimitive-v2_35_0.xsd b/v2_35_0/CDT-requestPrimitive-v2_35_0.xsd
index e2f386f8490f3b633d4e8d11ac25f548c5d3bbde..2b62a8e6a033522f456a8a3b0fb628edfaf9d540 100644
--- a/v2_35_0/CDT-requestPrimitive-v2_35_0.xsd
+++ b/v2_35_0/CDT-requestPrimitive-v2_35_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-v2_34_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_35_0/CDT-responsePrimitive-v2_35_0.xsd b/v2_35_0/CDT-responsePrimitive-v2_35_0.xsd
index 27fdf3d3a16d857f5646655516aa399849bbf6b6..f1a42d4c0140c9fa7c18b4b03519c741c82902f5 100644
--- a/v2_35_0/CDT-responsePrimitive-v2_35_0.xsd
+++ b/v2_35_0/CDT-responsePrimitive-v2_35_0.xsd
@@ -28,54 +28,54 @@ 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-v2_34_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_34_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_34_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_35_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_35_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_35_0/CDT-role-v2_35_0.xsd b/v2_35_0/CDT-role-v2_35_0.xsd
index 3869d6e2a951e0afc45320a57507a9ad1a85fa2c..ee988038eacb07b040cc03aea84ba27a96f8db72 100644
--- a/v2_35_0/CDT-role-v2_35_0.xsd
+++ b/v2_35_0/CDT-role-v2_35_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-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-schedule-v2_35_0.xsd b/v2_35_0/CDT-schedule-v2_35_0.xsd
index dc126c1510c9f932ff9608fc197a7b7ea4958a7a..72f8325580e00608e5f38c050053a155fee5dacd 100644
--- a/v2_35_0/CDT-schedule-v2_35_0.xsd
+++ b/v2_35_0/CDT-schedule-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-semanticDescriptor-v2_35_0.xsd b/v2_35_0/CDT-semanticDescriptor-v2_35_0.xsd
index add89fcecf9632b823c813ab6afbe28251152b3d..8e9fc4109d3d02f9230e06f19d956dfc2eca1be6 100644
--- a/v2_35_0/CDT-semanticDescriptor-v2_35_0.xsd
+++ b/v2_35_0/CDT-semanticDescriptor-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-serviceSubscribedAppRule-v2_35_0.xsd b/v2_35_0/CDT-serviceSubscribedAppRule-v2_35_0.xsd
index cba06f59e886f88077a5c860beff5060bd3780a7..d97456bc7b481d72f2765e39f09617d777e0a288 100644
--- a/v2_35_0/CDT-serviceSubscribedAppRule-v2_35_0.xsd
+++ b/v2_35_0/CDT-serviceSubscribedAppRule-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-serviceSubscribedNode-v2_35_0.xsd b/v2_35_0/CDT-serviceSubscribedNode-v2_35_0.xsd
index c67fdebf1a51b693540926e1b8174d3b7acbfc56..7fd0408299228e6817a4681222b210bfee11c300 100644
--- a/v2_35_0/CDT-serviceSubscribedNode-v2_35_0.xsd
+++ b/v2_35_0/CDT-serviceSubscribedNode-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-software-v2_35_0.xsd b/v2_35_0/CDT-software-v2_35_0.xsd
index 2392145426bbecce8f6da99606a049c776f14023..58b7fd098d7496932c2cdb439bb799f81ee27f88 100644
--- a/v2_35_0/CDT-software-v2_35_0.xsd
+++ b/v2_35_0/CDT-software-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-statsCollect-v2_35_0.xsd b/v2_35_0/CDT-statsCollect-v2_35_0.xsd
index 6f90fca65b5a2639c6433c8a4dcf361afc0e70e1..4f4606da77b32b5639ded075d80f65464c24ce9c 100644
--- a/v2_35_0/CDT-statsCollect-v2_35_0.xsd
+++ b/v2_35_0/CDT-statsCollect-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-statsConfig-v2_35_0.xsd b/v2_35_0/CDT-statsConfig-v2_35_0.xsd
index e31ea8e5767b7041ba368db785179293d404006d..ac26ffef123fa2167f3758d3f282866913cdb88d 100644
--- a/v2_35_0/CDT-statsConfig-v2_35_0.xsd
+++ b/v2_35_0/CDT-statsConfig-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-subscription-v2_35_0.xsd b/v2_35_0/CDT-subscription-v2_35_0.xsd
index 1c5e15fdb481522d2d8f091d8fb210c8dba7373e..86d25b603c2e55cb354864b088711e5fab9ee286 100644
--- a/v2_35_0/CDT-subscription-v2_35_0.xsd
+++ b/v2_35_0/CDT-subscription-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_35_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-svcFwWrapper-v2_35_0.xsd b/v2_35_0/CDT-svcFwWrapper-v2_35_0.xsd
index a0988b6a39794beea2f60125ba7a5db1b4efd384..5a025ad9326324e44f877d7cdc237c099694ba5f 100644
--- a/v2_35_0/CDT-svcFwWrapper-v2_35_0.xsd
+++ b/v2_35_0/CDT-svcFwWrapper-v2_35_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-v2_34_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-svcObjWrapper-v2_35_0.xsd b/v2_35_0/CDT-svcObjWrapper-v2_35_0.xsd
index 6ec0ee934b6caabec42c3b9c92e9f931e4a9fe40..b581c45b38511ecb854198a1776960bd88e14ed8 100644
--- a/v2_35_0/CDT-svcObjWrapper-v2_35_0.xsd
+++ b/v2_35_0/CDT-svcObjWrapper-v2_35_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-v2_34_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v2_35_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-timeSeries-v2_35_0.xsd b/v2_35_0/CDT-timeSeries-v2_35_0.xsd
index 040fd611d350938393ad0daa93930137198a0b16..b31e40e169d513b26d3e16afb0a3a931efac5665 100644
--- a/v2_35_0/CDT-timeSeries-v2_35_0.xsd
+++ b/v2_35_0/CDT-timeSeries-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_35_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_35_0/CDT-timeSeriesInstance-v2_35_0.xsd b/v2_35_0/CDT-timeSeriesInstance-v2_35_0.xsd
index 39b3f5144232deb482670c8a9903cfb3698230aa..7cec01a30c5e4ddcbb7134fe289657b56423ec93 100644
--- a/v2_35_0/CDT-timeSeriesInstance-v2_35_0.xsd
+++ b/v2_35_0/CDT-timeSeriesInstance-v2_35_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-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-token-v2_35_0.xsd b/v2_35_0/CDT-token-v2_35_0.xsd
index 12848faa3301e84f9ec60b5209277522ac1b2ce3..67c9c3ec6b1943823ae11c865e24d57a795933a1 100644
--- a/v2_35_0/CDT-token-v2_35_0.xsd
+++ b/v2_35_0/CDT-token-v2_35_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-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_35_0/CDT-trafficPattern-v2_35_0.xsd b/v2_35_0/CDT-trafficPattern-v2_35_0.xsd
index 8cfe8f1cc8667d4bc623b14b702a6a1c2ea24765..f57e025c0fb091a25403750358a776f5276c78bb 100644
--- a/v2_35_0/CDT-trafficPattern-v2_35_0.xsd
+++ b/v2_35_0/CDT-trafficPattern-v2_35_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-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_34_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_34_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_35_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_35_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>