diff --git a/v3_4_0/CDT-AE-v3_4_0.xsd b/v3_4_0/CDT-AE-v3_4_0.xsd
index 902afd1f73fbd2faa7eabc0f59dcf6c48e7f5257..1fee4e085d9ba99bbaba1ea58f07ad7f1a7df19e 100644
--- a/v3_4_0/CDT-AE-v3_4_0.xsd
+++ b/v3_4_0/CDT-AE-v3_4_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-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_4_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-CSEBase-v3_4_0.xsd b/v3_4_0/CDT-CSEBase-v3_4_0.xsd
index 30fe22c00aa28dfd717e896243c9cc22186f6d26..b5f06ae191b0e2e4c8b98da2a1f6667bdad7ad2c 100644
--- a/v3_4_0/CDT-CSEBase-v3_4_0.xsd
+++ b/v3_4_0/CDT-CSEBase-v3_4_0.xsd
@@ -26,29 +26,29 @@ 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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_3_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_4_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_4_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-accessControlPolicy-v3_4_0.xsd b/v3_4_0/CDT-accessControlPolicy-v3_4_0.xsd
index da10986d5d3c2a25d50202742070bc3ca6629ad8..6f0ad4c04bb6ac063748e02d96d2c722c2ecb7ff 100644
--- a/v3_4_0/CDT-accessControlPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-accessControlPolicy-v3_4_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_3_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-activeCmdhPolicy-v3_4_0.xsd b/v3_4_0/CDT-activeCmdhPolicy-v3_4_0.xsd
index 19b1c7b1c0e1b7ec0faed44811a4431d5880bb3a..2ac34634e31c780a5c96d09381143114543c5c0c 100644
--- a/v3_4_0/CDT-activeCmdhPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-activeCmdhPolicy-v3_4_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_3_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_4_0/CDT-allJoynApp-v3_4_0.xsd b/v3_4_0/CDT-allJoynApp-v3_4_0.xsd
index 18ceda819c211bd991827ea2e0fd8ce37b91c8fe..476e793296bbbb4b9cbb4652d4c69e59ede7a2bf 100644
--- a/v3_4_0/CDT-allJoynApp-v3_4_0.xsd
+++ b/v3_4_0/CDT-allJoynApp-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_4_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-allJoynInterface-v3_4_0.xsd b/v3_4_0/CDT-allJoynInterface-v3_4_0.xsd
index 6d890b514cd5e94e9d39e6fcf18a62fce43924eb..1b247bd4cdb5547cc1a65afa20ff8a572f73982f 100644
--- a/v3_4_0/CDT-allJoynInterface-v3_4_0.xsd
+++ b/v3_4_0/CDT-allJoynInterface-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_4_0/CDT-allJoynMethod-v3_4_0.xsd b/v3_4_0/CDT-allJoynMethod-v3_4_0.xsd
index 3f6caf7017ab39fc5e47d188db76afd3a61ff550..e58437a4d961717386f4780ba9184b4054bd74b7 100644
--- a/v3_4_0/CDT-allJoynMethod-v3_4_0.xsd
+++ b/v3_4_0/CDT-allJoynMethod-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_4_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_4_0/CDT-allJoynMethodCall-v3_4_0.xsd b/v3_4_0/CDT-allJoynMethodCall-v3_4_0.xsd
index eefaa72aeb2a61c1f79b97bd7bb0c49c5f89282a..16f8cf746ab7f68cea32d4812a3f0d41f49ca728 100644
--- a/v3_4_0/CDT-allJoynMethodCall-v3_4_0.xsd
+++ b/v3_4_0/CDT-allJoynMethodCall-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-allJoynProperty-v3_4_0.xsd b/v3_4_0/CDT-allJoynProperty-v3_4_0.xsd
index 12eed125c26813c4f402c969371d57b226a47564..4b184f325728b24ef30dd835d08965e2f61c4e5a 100644
--- a/v3_4_0/CDT-allJoynProperty-v3_4_0.xsd
+++ b/v3_4_0/CDT-allJoynProperty-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-allJoynSvcObject-v3_4_0.xsd b/v3_4_0/CDT-allJoynSvcObject-v3_4_0.xsd
index 977815290370a0e615fd187756c0cb71ba5d1fb2..39a496237a978ea755c54af0e78dd39311a2dafb 100644
--- a/v3_4_0/CDT-allJoynSvcObject-v3_4_0.xsd
+++ b/v3_4_0/CDT-allJoynSvcObject-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_4_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-areaNwkDeviceInfo-v3_4_0.xsd b/v3_4_0/CDT-areaNwkDeviceInfo-v3_4_0.xsd
index 713544a936d4fc7111ef558bb32c7be70b19277f..af5e06337949f8ef5ce5fbec13f40e55f4aedba2 100644
--- a/v3_4_0/CDT-areaNwkDeviceInfo-v3_4_0.xsd
+++ b/v3_4_0/CDT-areaNwkDeviceInfo-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-areaNwkInfo-v3_4_0.xsd b/v3_4_0/CDT-areaNwkInfo-v3_4_0.xsd
index 49cf6c90441b4600a0e671bf06d2bdc778acd4c3..94d60e876f1e03fdd404a2e9a81890cee22b5ff9 100644
--- a/v3_4_0/CDT-areaNwkInfo-v3_4_0.xsd
+++ b/v3_4_0/CDT-areaNwkInfo-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-authorizationDecision-v3_4_0.xsd b/v3_4_0/CDT-authorizationDecision-v3_4_0.xsd
index 1eefb2c1cd12f427c9f11f56607eb85fa86bd881..7706d5079013f1e0573d800751d6b3223b91f6a8 100644
--- a/v3_4_0/CDT-authorizationDecision-v3_4_0.xsd
+++ b/v3_4_0/CDT-authorizationDecision-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-authorizationInformation-v3_4_0.xsd b/v3_4_0/CDT-authorizationInformation-v3_4_0.xsd
index 051e131fbffcf2af30e1a45b98639e24edf94940..66eada97de78cf3e033f54428c5ead269bf55104 100644
--- a/v3_4_0/CDT-authorizationInformation-v3_4_0.xsd
+++ b/v3_4_0/CDT-authorizationInformation-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_4_0.xsd" />
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-authorizationPolicy-v3_4_0.xsd b/v3_4_0/CDT-authorizationPolicy-v3_4_0.xsd
index af4ac9f6fae1254ffaa4e9e452b98953ee3b3160..5697e78ebd964983c2441f389860a1c353f5d0b8 100644
--- a/v3_4_0/CDT-authorizationPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-authorizationPolicy-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-battery-v3_4_0.xsd b/v3_4_0/CDT-battery-v3_4_0.xsd
index 6d1ee6d983d24e3e5ca2a2df0cd462e1950fdf91..0c4e423229d9837f7432367d0e0f623e91e2665d 100644
--- a/v3_4_0/CDT-battery-v3_4_0.xsd
+++ b/v3_4_0/CDT-battery-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-cmdhBuffer-v3_4_0.xsd b/v3_4_0/CDT-cmdhBuffer-v3_4_0.xsd
index 5c6b3980c57ae7777975111e04f8a1c055e6baab..48e1c16a3d74952ad08378d3819b9ea07d291079 100644
--- a/v3_4_0/CDT-cmdhBuffer-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhBuffer-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_4_0/CDT-cmdhDefEcValue-v3_4_0.xsd b/v3_4_0/CDT-cmdhDefEcValue-v3_4_0.xsd
index 1a6471767ee8d145e645c700da0e7fa4d6ee4c2c..d96cdc99a68b164fc8bff46656005614ccb45924 100644
--- a/v3_4_0/CDT-cmdhDefEcValue-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhDefEcValue-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_4_0/CDT-cmdhDefaults-v3_4_0.xsd b/v3_4_0/CDT-cmdhDefaults-v3_4_0.xsd
index d4a02e6493ed9a4eea39f83f330c2fe74c6a1ec3..9bb78de7095481a831aada496d503b13167ca44d 100644
--- a/v3_4_0/CDT-cmdhDefaults-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhDefaults-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_4_0/CDT-cmdhEcDefParamValues-v3_4_0.xsd b/v3_4_0/CDT-cmdhEcDefParamValues-v3_4_0.xsd
index 12b27e1447348713735eb98f21817bbdacba07d0..363aef1fef71ebdfaca0881dbb769feb74759595 100644
--- a/v3_4_0/CDT-cmdhEcDefParamValues-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhEcDefParamValues-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_4_0/CDT-cmdhLimits-v3_4_0.xsd b/v3_4_0/CDT-cmdhLimits-v3_4_0.xsd
index 34f7cdbef4a462ca6d20c280f8ed5a761b6a982a..2da567621ce702aa8d45cc6bcca960960cec13ac 100644
--- a/v3_4_0/CDT-cmdhLimits-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhLimits-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_4_0/CDT-cmdhNetworkAccessRules-v3_4_0.xsd b/v3_4_0/CDT-cmdhNetworkAccessRules-v3_4_0.xsd
index ea0a73e611bdfe450530955dbec7cfe829c3b062..ac3841083090276f5a2f8c05d48096ba26f4f99c 100644
--- a/v3_4_0/CDT-cmdhNetworkAccessRules-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhNetworkAccessRules-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_4_0/CDT-cmdhNwAccessRule-v3_4_0.xsd b/v3_4_0/CDT-cmdhNwAccessRule-v3_4_0.xsd
index 0506fa5df14b9fb61b850172ec594e30a9bb304c..718c1e1da2ad0339a7f72849251346a473b8837a 100644
--- a/v3_4_0/CDT-cmdhNwAccessRule-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhNwAccessRule-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_4_0/CDT-cmdhPolicy-v3_4_0.xsd b/v3_4_0/CDT-cmdhPolicy-v3_4_0.xsd
index e1059ac4f1cc7d72e3aa7f9d43332261e9a101b0..84ecb9391e27fd2ac4664bc399eae8345348cf5c 100644
--- a/v3_4_0/CDT-cmdhPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhPolicy-v3_4_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_3_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_4_0/CDT-commonTypes-v3_4_0.xsd b/v3_4_0/CDT-commonTypes-v3_4_0.xsd
index d89973dc47ece5569e3a2b4fc7f026a82fea94e8..22ab6f36c3e3f7444aa9508e023b08dd669d0959 100644
--- a/v3_4_0/CDT-commonTypes-v3_4_0.xsd
+++ b/v3_4_0/CDT-commonTypes-v3_4_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_4_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_4_0/CDT-container-v3_4_0.xsd b/v3_4_0/CDT-container-v3_4_0.xsd
index 04cdbf4027e46697fc31cd8ecaf550f63fdfd658..c241f42b5729c543337a9024f531ee850dc45b83 100644
--- a/v3_4_0/CDT-container-v3_4_0.xsd
+++ b/v3_4_0/CDT-container-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_4_0/CDT-contentInstance-v3_4_0.xsd b/v3_4_0/CDT-contentInstance-v3_4_0.xsd
index 4fd66b51f864b803d46954c2bfe16707606e1319..7512f3613748898a870301476f0b109de0d48f9a 100644
--- a/v3_4_0/CDT-contentInstance-v3_4_0.xsd
+++ b/v3_4_0/CDT-contentInstance-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-delivery-v3_4_0.xsd b/v3_4_0/CDT-delivery-v3_4_0.xsd
index e37ba0940b2723a524442f067c821230d6392d71..d07d57af4169255c6fbf5ca526df3fffd1a670c6 100644
--- a/v3_4_0/CDT-delivery-v3_4_0.xsd
+++ b/v3_4_0/CDT-delivery-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_4_0/CDT-deviceCapability-v3_4_0.xsd b/v3_4_0/CDT-deviceCapability-v3_4_0.xsd
index c4a1b0b892e36573de0bcdcbdcc66d8a986562e2..6f46e34f854ccf167df8b0f1b523f76ce992688e 100644
--- a/v3_4_0/CDT-deviceCapability-v3_4_0.xsd
+++ b/v3_4_0/CDT-deviceCapability-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-deviceInfo-v3_4_0.xsd b/v3_4_0/CDT-deviceInfo-v3_4_0.xsd
index 85597f9e32bbf4c260a5536e117b295ab4ec2ea0..3c4e6879e51ff530d8611534ac495b6f62d46e0e 100644
--- a/v3_4_0/CDT-deviceInfo-v3_4_0.xsd
+++ b/v3_4_0/CDT-deviceInfo-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-dynamicAuthorizationConsultation-v3_4_0.xsd b/v3_4_0/CDT-dynamicAuthorizationConsultation-v3_4_0.xsd
index 4945e5e646e7916fbebc3453bb7e617d16bd1b72..bbfe29d4a95ad88e9de1a484028721731bbe05f5 100644
--- a/v3_4_0/CDT-dynamicAuthorizationConsultation-v3_4_0.xsd
+++ b/v3_4_0/CDT-dynamicAuthorizationConsultation-v3_4_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-eventConfig-v3_4_0.xsd b/v3_4_0/CDT-eventConfig-v3_4_0.xsd
index c74038376117836004ff775d684dcc9a1b104868..04bca032e978edf5a7a848c2f91bd31c756f902e 100644
--- a/v3_4_0/CDT-eventConfig-v3_4_0.xsd
+++ b/v3_4_0/CDT-eventConfig-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-eventLog-v3_4_0.xsd b/v3_4_0/CDT-eventLog-v3_4_0.xsd
index 867ba5139512e860f890d0f144b93c48dc19b8f5..24c94e1084dd9fb1770219aac24312649eb1c8ef 100644
--- a/v3_4_0/CDT-eventLog-v3_4_0.xsd
+++ b/v3_4_0/CDT-eventLog-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-execInstance-v3_4_0.xsd b/v3_4_0/CDT-execInstance-v3_4_0.xsd
index 04fad98377caf9abfb619129e5078c47540e1840..6427b4f27dff6483112fc67d54970bc1e3ac597f 100644
--- a/v3_4_0/CDT-execInstance-v3_4_0.xsd
+++ b/v3_4_0/CDT-execInstance-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-firmware-v3_4_0.xsd b/v3_4_0/CDT-firmware-v3_4_0.xsd
index 3f1ca748ec8524766f358cbf0f943e7da63212a7..4638cb303374252e6e722f570ec77eaba2bb7948 100644
--- a/v3_4_0/CDT-firmware-v3_4_0.xsd
+++ b/v3_4_0/CDT-firmware-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-genericInterworkingOperationInstance-v3_4_0.xsd b/v3_4_0/CDT-genericInterworkingOperationInstance-v3_4_0.xsd
index 09bbe136658bac558ab76b5772dfe4bc9cd5fc79..295812cc724c6d13456c8214888ebccf212eb12f 100644
--- a/v3_4_0/CDT-genericInterworkingOperationInstance-v3_4_0.xsd
+++ b/v3_4_0/CDT-genericInterworkingOperationInstance-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-genericInterworkingService-v3_4_0.xsd b/v3_4_0/CDT-genericInterworkingService-v3_4_0.xsd
index 053a095b946298e792e91fe5b4aa639d5caa912d..bf0b9b43f57599a548ef4397acf11058b84d788c 100644
--- a/v3_4_0/CDT-genericInterworkingService-v3_4_0.xsd
+++ b/v3_4_0/CDT-genericInterworkingService-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_4_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-group-v3_4_0.xsd b/v3_4_0/CDT-group-v3_4_0.xsd
index 52d62de684def54e19202c2f27033c66aa6be4a3..1975d82fdd3bec273a5026db2b3e439a3e860bab 100644
--- a/v3_4_0/CDT-group-v3_4_0.xsd
+++ b/v3_4_0/CDT-group-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-locationPolicy-v3_4_0.xsd b/v3_4_0/CDT-locationPolicy-v3_4_0.xsd
index 4c817bba5cbe18c38f950995f712f2d6444c1097..70b6b8f07523b29d6253f07fcb72af0810d49308 100644
--- a/v3_4_0/CDT-locationPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-locationPolicy-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-m2mServiceSubscriptionProfile-v3_4_0.xsd b/v3_4_0/CDT-m2mServiceSubscriptionProfile-v3_4_0.xsd
index 067966f6241465e932e722fe7244e9368c03d588..c9c72c8bbfd6ea0e569c5a93df4e17d8bcb1b4da 100644
--- a/v3_4_0/CDT-m2mServiceSubscriptionProfile-v3_4_0.xsd
+++ b/v3_4_0/CDT-m2mServiceSubscriptionProfile-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_4_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-memory-v3_4_0.xsd b/v3_4_0/CDT-memory-v3_4_0.xsd
index 5c47de0845094d61cda38fa3d604f05645ea6f69..1abb2d8112862416e73a554a519e9039aaa08ea1 100644
--- a/v3_4_0/CDT-memory-v3_4_0.xsd
+++ b/v3_4_0/CDT-memory-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-mgmtCmd-v3_4_0.xsd b/v3_4_0/CDT-mgmtCmd-v3_4_0.xsd
index 90fc2cff47c543958e06e0a93c8dd71646661724..5bf2761ec03d7649baba5326bad8bd9fc26bcc2b 100644
--- a/v3_4_0/CDT-mgmtCmd-v3_4_0.xsd
+++ b/v3_4_0/CDT-mgmtCmd-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_4_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-node-v3_4_0.xsd b/v3_4_0/CDT-node-v3_4_0.xsd
index 4589343dbe01b8c2d4114c32e75a993b74789cd1..4a5510d641fdef72f9e10e460383c83ce067d9f0 100644
--- a/v3_4_0/CDT-node-v3_4_0.xsd
+++ b/v3_4_0/CDT-node-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_4_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-notification-v3_4_0.xsd b/v3_4_0/CDT-notification-v3_4_0.xsd
index 0ae6d1c556ad9d27162c977bf6992e99e7fd8454..92c5fac7430e8653c035a01d8cd4f5b3d9f01fdc 100644
--- a/v3_4_0/CDT-notification-v3_4_0.xsd
+++ b/v3_4_0/CDT-notification-v3_4_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_3_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_3_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_4_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_4_0/CDT-notificationTargetMgmtPolicyRef-v3_4_0.xsd b/v3_4_0/CDT-notificationTargetMgmtPolicyRef-v3_4_0.xsd
index bbb2b5d3a5eb6860c4d40b2a0d6a51deb96b1218..753567b4537096f2f4bcbb7a924278207327576d 100644
--- a/v3_4_0/CDT-notificationTargetMgmtPolicyRef-v3_4_0.xsd
+++ b/v3_4_0/CDT-notificationTargetMgmtPolicyRef-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-notificationTargetPolicy-v3_4_0.xsd b/v3_4_0/CDT-notificationTargetPolicy-v3_4_0.xsd
index 5df81c02d1c9adbbe7ce9e0a3f59d82f88a69215..1cae66aeba47b00830a748147571392dd8cd9152 100644
--- a/v3_4_0/CDT-notificationTargetPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-notificationTargetPolicy-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-policyDeletionRules-v3_4_0.xsd b/v3_4_0/CDT-policyDeletionRules-v3_4_0.xsd
index 5714709932c2663766d34911ea7c5ccae96a986a..c834f99bf2043349e8796d41fa5bbcf7667091cb 100644
--- a/v3_4_0/CDT-policyDeletionRules-v3_4_0.xsd
+++ b/v3_4_0/CDT-policyDeletionRules-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-pollingChannel-v3_4_0.xsd b/v3_4_0/CDT-pollingChannel-v3_4_0.xsd
index 5a0463a0fac3c1ff5783ff5499aae40a50a143f0..55fc006c6ff532553e743923c9d3b9184e71ee48 100644
--- a/v3_4_0/CDT-pollingChannel-v3_4_0.xsd
+++ b/v3_4_0/CDT-pollingChannel-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-reboot-v3_4_0.xsd b/v3_4_0/CDT-reboot-v3_4_0.xsd
index 9e6fe78dc018b23b391c64589a1928bd3b254037..72e00360d7748d71b0919844e7cee01c9a77296b 100644
--- a/v3_4_0/CDT-reboot-v3_4_0.xsd
+++ b/v3_4_0/CDT-reboot-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-remoteCSE-v3_4_0.xsd b/v3_4_0/CDT-remoteCSE-v3_4_0.xsd
index 229f462cd4d1e639c9ed81b77ebc415c28b59256..c2bab36756a4f60fb467aad79c8aa850f6088148 100644
--- a/v3_4_0/CDT-remoteCSE-v3_4_0.xsd
+++ b/v3_4_0/CDT-remoteCSE-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_4_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-request-v3_4_0.xsd b/v3_4_0/CDT-request-v3_4_0.xsd
index 667186634b6833b72fb64b3e2ab507e5fda87225..dc61c3395cc4671883260fb14f9912ceff71f57c 100644
--- a/v3_4_0/CDT-request-v3_4_0.xsd
+++ b/v3_4_0/CDT-request-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-requestPrimitive-v3_4_0.xsd b/v3_4_0/CDT-requestPrimitive-v3_4_0.xsd
index 132aef5b3422f0b91f6cb76fa2da5a8e1fdfef95..0eee7ca8b94daa2e6428868550d4cb69fcd57f63 100644
--- a/v3_4_0/CDT-requestPrimitive-v3_4_0.xsd
+++ b/v3_4_0/CDT-requestPrimitive-v3_4_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_3_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_4_0/CDT-responsePrimitive-v3_4_0.xsd b/v3_4_0/CDT-responsePrimitive-v3_4_0.xsd
index e3d688b2fc2a2bded29db1acf2e328edf4d8e535..54e6a65f046cfdcdd67f92b2c04bda80f84c347a 100644
--- a/v3_4_0/CDT-responsePrimitive-v3_4_0.xsd
+++ b/v3_4_0/CDT-responsePrimitive-v3_4_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_3_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_4_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_4_0/CDT-role-v3_4_0.xsd b/v3_4_0/CDT-role-v3_4_0.xsd
index d874d1f902a92f6540a7e35967fbdc70cbb045f7..1e62533b656577dd47982ad969fe652299cf7e8d 100644
--- a/v3_4_0/CDT-role-v3_4_0.xsd
+++ b/v3_4_0/CDT-role-v3_4_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-schedule-v3_4_0.xsd b/v3_4_0/CDT-schedule-v3_4_0.xsd
index d9feab714f124d2f07e6d83645c89037120f17ad..99fc8b75fd13886d10bc59fb97fba7b56f323c18 100644
--- a/v3_4_0/CDT-schedule-v3_4_0.xsd
+++ b/v3_4_0/CDT-schedule-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-semanticDescriptor-v3_4_0.xsd b/v3_4_0/CDT-semanticDescriptor-v3_4_0.xsd
index 0982325685129f99116bb00be61920db0374a1a6..14bd83b3138664e792851a3c4715bb447cf4a28e 100644
--- a/v3_4_0/CDT-semanticDescriptor-v3_4_0.xsd
+++ b/v3_4_0/CDT-semanticDescriptor-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-serviceSubscribedAppRule-v3_4_0.xsd b/v3_4_0/CDT-serviceSubscribedAppRule-v3_4_0.xsd
index d37b64ac0854a7d8ce25bf9a0e5206e19bf9f671..5b9f894f37e1ae868b1ce1b3133fafb98520c74a 100644
--- a/v3_4_0/CDT-serviceSubscribedAppRule-v3_4_0.xsd
+++ b/v3_4_0/CDT-serviceSubscribedAppRule-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-serviceSubscribedNode-v3_4_0.xsd b/v3_4_0/CDT-serviceSubscribedNode-v3_4_0.xsd
index e16598b4584c803bf71d5e985c12ace2501afaa6..a8e59d5965f07d6d60a7a2f0268e98cbd1421967 100644
--- a/v3_4_0/CDT-serviceSubscribedNode-v3_4_0.xsd
+++ b/v3_4_0/CDT-serviceSubscribedNode-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-software-v3_4_0.xsd b/v3_4_0/CDT-software-v3_4_0.xsd
index acd62d0264bd4c7c6fe3f17e248eaf538f847a20..887eaf8e681476e7a8f29ae993bdb0be543ea5d0 100644
--- a/v3_4_0/CDT-software-v3_4_0.xsd
+++ b/v3_4_0/CDT-software-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-statsCollect-v3_4_0.xsd b/v3_4_0/CDT-statsCollect-v3_4_0.xsd
index 442d51f0c37bd34f95d7abe7340acbd7f5ca5399..e5a2f714dbf2379c4cfcc8882ed6abcb220c2848 100644
--- a/v3_4_0/CDT-statsCollect-v3_4_0.xsd
+++ b/v3_4_0/CDT-statsCollect-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-statsConfig-v3_4_0.xsd b/v3_4_0/CDT-statsConfig-v3_4_0.xsd
index a24609ba1b423e1f66a6b42bf4abd6ad97afb68d..238f7ea82eb69dbbe4c87701d3e7d63fba2bb9e5 100644
--- a/v3_4_0/CDT-statsConfig-v3_4_0.xsd
+++ b/v3_4_0/CDT-statsConfig-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-subscription-v3_4_0.xsd b/v3_4_0/CDT-subscription-v3_4_0.xsd
index 40a0519b36b1465b0a17f1094fffc44630534953..b7f8208afb42223d42bcc83c075111744feccf0a 100644
--- a/v3_4_0/CDT-subscription-v3_4_0.xsd
+++ b/v3_4_0/CDT-subscription-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_4_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-svcFwWrapper-v3_4_0.xsd b/v3_4_0/CDT-svcFwWrapper-v3_4_0.xsd
index 788f54cb2b994030ec23d3ca4d134fe3965b0b57..2fd9f2d3b3cc75da01a88daa385661b6627481f7 100644
--- a/v3_4_0/CDT-svcFwWrapper-v3_4_0.xsd
+++ b/v3_4_0/CDT-svcFwWrapper-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-svcObjWrapper-v3_4_0.xsd b/v3_4_0/CDT-svcObjWrapper-v3_4_0.xsd
index 6b147cc899a36331d9b1a6247216e4eb555b7f04..83f3929c11f0c08e56493533cb25abac10c1bcc5 100644
--- a/v3_4_0/CDT-svcObjWrapper-v3_4_0.xsd
+++ b/v3_4_0/CDT-svcObjWrapper-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_4_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-timeSeries-v3_4_0.xsd b/v3_4_0/CDT-timeSeries-v3_4_0.xsd
index aec8b861d09b0e35224a9e9488c66bc04189a5f2..af6cb7c8c1c1aa530d0e726c6bfee270c7b1747d 100644
--- a/v3_4_0/CDT-timeSeries-v3_4_0.xsd
+++ b/v3_4_0/CDT-timeSeries-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_4_0/CDT-timeSeriesInstance-v3_4_0.xsd b/v3_4_0/CDT-timeSeriesInstance-v3_4_0.xsd
index 2f1982fd3e4ed16bc3a45dd0123564de80a784db..1eafb7a8149f2bfec00a201269817c7dfb6ded62 100644
--- a/v3_4_0/CDT-timeSeriesInstance-v3_4_0.xsd
+++ b/v3_4_0/CDT-timeSeriesInstance-v3_4_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-token-v3_4_0.xsd b/v3_4_0/CDT-token-v3_4_0.xsd
index 15888679c4b6b747e478a358fc5a2a84faa5d0cc..8201a3f3fdd9610f83a4f59cd269a2df1bdd53cd 100644
--- a/v3_4_0/CDT-token-v3_4_0.xsd
+++ b/v3_4_0/CDT-token-v3_4_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-trafficPattern-v3_4_0.xsd b/v3_4_0/CDT-trafficPattern-v3_4_0.xsd
index 01163ebfb435180b08051b08ddc5cf227b86db06..12af7f7a6cd9822ca0719e660a7a88dbba1e8b48 100644
--- a/v3_4_0/CDT-trafficPattern-v3_4_0.xsd
+++ b/v3_4_0/CDT-trafficPattern-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>