From 16e64984c4520953de33929dc3a62fb348580d83 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Sat, 29 Jul 2017 17:51:34 +0200
Subject: [PATCH] updated schemaLocation attribute values

---
 v3_3_0/CDT-AE-v3_3_0.xsd                      | 20 ++--
 v3_3_0/CDT-CSEBase-v3_3_0.xsd                 | 40 ++++----
 v3_3_0/CDT-accessControlPolicy-v3_3_0.xsd     |  4 +-
 v3_3_0/CDT-activeCmdhPolicy-v3_3_0.xsd        |  2 +-
 v3_3_0/CDT-allJoynApp-v3_3_0.xsd              |  8 +-
 v3_3_0/CDT-allJoynInterface-v3_3_0.xsd        | 12 +--
 v3_3_0/CDT-allJoynMethod-v3_3_0.xsd           |  8 +-
 v3_3_0/CDT-allJoynMethodCall-v3_3_0.xsd       |  6 +-
 v3_3_0/CDT-allJoynProperty-v3_3_0.xsd         |  6 +-
 v3_3_0/CDT-allJoynSvcObject-v3_3_0.xsd        |  8 +-
 v3_3_0/CDT-areaNwkDeviceInfo-v3_3_0.xsd       |  4 +-
 v3_3_0/CDT-areaNwkInfo-v3_3_0.xsd             |  4 +-
 v3_3_0/CDT-battery-v3_3_0.xsd                 |  4 +-
 v3_3_0/CDT-cmdhBuffer-v3_3_0.xsd              |  2 +-
 v3_3_0/CDT-cmdhDefEcValue-v3_3_0.xsd          |  2 +-
 v3_3_0/CDT-cmdhDefaults-v3_3_0.xsd            |  2 +-
 v3_3_0/CDT-cmdhEcDefParamValues-v3_3_0.xsd    |  2 +-
 v3_3_0/CDT-cmdhLimits-v3_3_0.xsd              |  2 +-
 v3_3_0/CDT-cmdhNetworkAccessRules-v3_3_0.xsd  |  2 +-
 v3_3_0/CDT-cmdhNwAccessRule-v3_3_0.xsd        |  2 +-
 v3_3_0/CDT-cmdhPolicy-v3_3_0.xsd              |  2 +-
 v3_3_0/CDT-commonTypes-v3_3_0.xsd             |  2 +-
 v3_3_0/CDT-container-v3_3_0.xsd               |  8 +-
 v3_3_0/CDT-contentInstance-v3_3_0.xsd         |  4 +-
 v3_3_0/CDT-delivery-v3_3_0.xsd                |  4 +-
 v3_3_0/CDT-deviceCapability-v3_3_0.xsd        |  4 +-
 v3_3_0/CDT-deviceInfo-v3_3_0.xsd              |  4 +-
 ...ynamicAuthorizationConsultation-v3_3_0.xsd |  2 +-
 v3_3_0/CDT-eventConfig-v3_3_0.xsd             |  4 +-
 v3_3_0/CDT-eventLog-v3_3_0.xsd                |  4 +-
 v3_3_0/CDT-execInstance-v3_3_0.xsd            |  4 +-
 v3_3_0/CDT-firmware-v3_3_0.xsd                |  4 +-
 ...icInterworkingOperationInstance-v3_3_0.xsd |  6 +-
 .../CDT-genericInterworkingService-v3_3_0.xsd |  8 +-
 v3_3_0/CDT-group-v3_3_0.xsd                   |  6 +-
 v3_3_0/CDT-locationPolicy-v3_3_0.xsd          |  4 +-
 ...T-m2mServiceSubscriptionProfile-v3_3_0.xsd |  6 +-
 v3_3_0/CDT-memory-v3_3_0.xsd                  |  4 +-
 v3_3_0/CDT-mgmtCmd-v3_3_0.xsd                 |  6 +-
 v3_3_0/CDT-node-v3_3_0.xsd                    | 32 +++---
 v3_3_0/CDT-notification-v3_3_0.xsd            |  4 +-
 ...notificationTargetMgmtPolicyRef-v3_3_0.xsd |  4 +-
 .../CDT-notificationTargetPolicy-v3_3_0.xsd   |  6 +-
 v3_3_0/CDT-policyDeletionRules-v3_3_0.xsd     |  4 +-
 v3_3_0/CDT-pollingChannel-v3_3_0.xsd          |  4 +-
 v3_3_0/CDT-reboot-v3_3_0.xsd                  |  4 +-
 v3_3_0/CDT-remoteCSE-v3_3_0.xsd               | 22 ++---
 v3_3_0/CDT-request-v3_3_0.xsd                 |  4 +-
 v3_3_0/CDT-requestPrimitive-v3_3_0.xsd        |  2 +-
 v3_3_0/CDT-responsePrimitive-v3_3_0.xsd       | 98 +++++++++----------
 v3_3_0/CDT-role-v3_3_0.xsd                    |  2 +-
 v3_3_0/CDT-schedule-v3_3_0.xsd                |  4 +-
 v3_3_0/CDT-semanticDescriptor-v3_3_0.xsd      |  4 +-
 .../CDT-serviceSubscribedAppRule-v3_3_0.xsd   |  4 +-
 v3_3_0/CDT-serviceSubscribedNode-v3_3_0.xsd   |  4 +-
 v3_3_0/CDT-software-v3_3_0.xsd                |  4 +-
 v3_3_0/CDT-statsCollect-v3_3_0.xsd            |  4 +-
 v3_3_0/CDT-statsConfig-v3_3_0.xsd             |  6 +-
 v3_3_0/CDT-subscription-v3_3_0.xsd            |  6 +-
 v3_3_0/CDT-svcFwWrapper-v3_3_0.xsd            |  6 +-
 v3_3_0/CDT-svcObjWrapper-v3_3_0.xsd           |  8 +-
 v3_3_0/CDT-timeSeries-v3_3_0.xsd              |  8 +-
 v3_3_0/CDT-timeSeriesInstance-v3_3_0.xsd      |  2 +-
 v3_3_0/CDT-token-v3_3_0.xsd                   |  2 +-
 v3_3_0/CDT-trafficPattern-v3_3_0.xsd          |  6 +-
 65 files changed, 240 insertions(+), 240 deletions(-)

diff --git a/v3_3_0/CDT-AE-v3_3_0.xsd b/v3_3_0/CDT-AE-v3_3_0.xsd
index d9793be..902afd1 100644
--- a/v3_3_0/CDT-AE-v3_3_0.xsd
+++ b/v3_3_0/CDT-AE-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_2_0.xsd" />
+	<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:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-CSEBase-v3_3_0.xsd b/v3_3_0/CDT-CSEBase-v3_3_0.xsd
index 86eeb6d..ace9429 100644
--- a/v3_3_0/CDT-CSEBase-v3_3_0.xsd
+++ b/v3_3_0/CDT-CSEBase-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_2_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_2_0.xsd" />
+	<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:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-accessControlPolicy-v3_3_0.xsd b/v3_3_0/CDT-accessControlPolicy-v3_3_0.xsd
index d5656d8..da10986 100644
--- a/v3_3_0/CDT-accessControlPolicy-v3_3_0.xsd
+++ b/v3_3_0/CDT-accessControlPolicy-v3_3_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_2_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-activeCmdhPolicy-v3_3_0.xsd b/v3_3_0/CDT-activeCmdhPolicy-v3_3_0.xsd
index 620f1fc..19b1c7b 100644
--- a/v3_3_0/CDT-activeCmdhPolicy-v3_3_0.xsd
+++ b/v3_3_0/CDT-activeCmdhPolicy-v3_3_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_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_3_0/CDT-allJoynApp-v3_3_0.xsd b/v3_3_0/CDT-allJoynApp-v3_3_0.xsd
index 8adeb63..18ceda8 100644
--- a/v3_3_0/CDT-allJoynApp-v3_3_0.xsd
+++ b/v3_3_0/CDT-allJoynApp-v3_3_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_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_2_0.xsd" />
+	<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:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-allJoynInterface-v3_3_0.xsd b/v3_3_0/CDT-allJoynInterface-v3_3_0.xsd
index 45ac7a0..6d890b5 100644
--- a/v3_3_0/CDT-allJoynInterface-v3_3_0.xsd
+++ b/v3_3_0/CDT-allJoynInterface-v3_3_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_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_2_0.xsd" />
+	<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:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_3_0/CDT-allJoynMethod-v3_3_0.xsd b/v3_3_0/CDT-allJoynMethod-v3_3_0.xsd
index 67a76c7..3f6caf7 100644
--- a/v3_3_0/CDT-allJoynMethod-v3_3_0.xsd
+++ b/v3_3_0/CDT-allJoynMethod-v3_3_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_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_2_0.xsd" />
+	<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:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_3_0/CDT-allJoynMethodCall-v3_3_0.xsd b/v3_3_0/CDT-allJoynMethodCall-v3_3_0.xsd
index 97c2ea6..eefaa72 100644
--- a/v3_3_0/CDT-allJoynMethodCall-v3_3_0.xsd
+++ b/v3_3_0/CDT-allJoynMethodCall-v3_3_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_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<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:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-allJoynProperty-v3_3_0.xsd b/v3_3_0/CDT-allJoynProperty-v3_3_0.xsd
index 1563689..12eed12 100644
--- a/v3_3_0/CDT-allJoynProperty-v3_3_0.xsd
+++ b/v3_3_0/CDT-allJoynProperty-v3_3_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_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<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:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-allJoynSvcObject-v3_3_0.xsd b/v3_3_0/CDT-allJoynSvcObject-v3_3_0.xsd
index 1998697..9778152 100644
--- a/v3_3_0/CDT-allJoynSvcObject-v3_3_0.xsd
+++ b/v3_3_0/CDT-allJoynSvcObject-v3_3_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_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_2_0.xsd" />
+	<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:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-areaNwkDeviceInfo-v3_3_0.xsd b/v3_3_0/CDT-areaNwkDeviceInfo-v3_3_0.xsd
index 0144f80..713544a 100644
--- a/v3_3_0/CDT-areaNwkDeviceInfo-v3_3_0.xsd
+++ b/v3_3_0/CDT-areaNwkDeviceInfo-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-areaNwkInfo-v3_3_0.xsd b/v3_3_0/CDT-areaNwkInfo-v3_3_0.xsd
index 7243119..49cf6c9 100644
--- a/v3_3_0/CDT-areaNwkInfo-v3_3_0.xsd
+++ b/v3_3_0/CDT-areaNwkInfo-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-battery-v3_3_0.xsd b/v3_3_0/CDT-battery-v3_3_0.xsd
index b269020..6d1ee6d 100644
--- a/v3_3_0/CDT-battery-v3_3_0.xsd
+++ b/v3_3_0/CDT-battery-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-cmdhBuffer-v3_3_0.xsd b/v3_3_0/CDT-cmdhBuffer-v3_3_0.xsd
index c5de99b..5c6b398 100644
--- a/v3_3_0/CDT-cmdhBuffer-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhBuffer-v3_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_3_0/CDT-cmdhDefEcValue-v3_3_0.xsd b/v3_3_0/CDT-cmdhDefEcValue-v3_3_0.xsd
index efc4a47..1a64717 100644
--- a/v3_3_0/CDT-cmdhDefEcValue-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhDefEcValue-v3_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_3_0/CDT-cmdhDefaults-v3_3_0.xsd b/v3_3_0/CDT-cmdhDefaults-v3_3_0.xsd
index 9154b5c..d4a02e6 100644
--- a/v3_3_0/CDT-cmdhDefaults-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhDefaults-v3_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_3_0/CDT-cmdhEcDefParamValues-v3_3_0.xsd b/v3_3_0/CDT-cmdhEcDefParamValues-v3_3_0.xsd
index 9a57d3d..12b27e1 100644
--- a/v3_3_0/CDT-cmdhEcDefParamValues-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhEcDefParamValues-v3_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_3_0/CDT-cmdhLimits-v3_3_0.xsd b/v3_3_0/CDT-cmdhLimits-v3_3_0.xsd
index ed9c984..34f7cdb 100644
--- a/v3_3_0/CDT-cmdhLimits-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhLimits-v3_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_3_0/CDT-cmdhNetworkAccessRules-v3_3_0.xsd b/v3_3_0/CDT-cmdhNetworkAccessRules-v3_3_0.xsd
index 75265c5..ea0a73e 100644
--- a/v3_3_0/CDT-cmdhNetworkAccessRules-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhNetworkAccessRules-v3_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_3_0/CDT-cmdhNwAccessRule-v3_3_0.xsd b/v3_3_0/CDT-cmdhNwAccessRule-v3_3_0.xsd
index 5fdadea..0506fa5 100644
--- a/v3_3_0/CDT-cmdhNwAccessRule-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhNwAccessRule-v3_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_3_0/CDT-cmdhPolicy-v3_3_0.xsd b/v3_3_0/CDT-cmdhPolicy-v3_3_0.xsd
index 581578a..e1059ac 100644
--- a/v3_3_0/CDT-cmdhPolicy-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhPolicy-v3_3_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_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_3_0/CDT-commonTypes-v3_3_0.xsd b/v3_3_0/CDT-commonTypes-v3_3_0.xsd
index 6c3ad1a..40df854 100644
--- a/v3_3_0/CDT-commonTypes-v3_3_0.xsd
+++ b/v3_3_0/CDT-commonTypes-v3_3_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_2_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_3_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_3_0/CDT-container-v3_3_0.xsd b/v3_3_0/CDT-container-v3_3_0.xsd
index b68ee9c..04cdbf4 100644
--- a/v3_3_0/CDT-container-v3_3_0.xsd
+++ b/v3_3_0/CDT-container-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
+	<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:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_3_0/CDT-contentInstance-v3_3_0.xsd b/v3_3_0/CDT-contentInstance-v3_3_0.xsd
index 0503ba8..4fd66b5 100644
--- a/v3_3_0/CDT-contentInstance-v3_3_0.xsd
+++ b/v3_3_0/CDT-contentInstance-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-delivery-v3_3_0.xsd b/v3_3_0/CDT-delivery-v3_3_0.xsd
index db57b7a..e37ba09 100644
--- a/v3_3_0/CDT-delivery-v3_3_0.xsd
+++ b/v3_3_0/CDT-delivery-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_3_0/CDT-deviceCapability-v3_3_0.xsd b/v3_3_0/CDT-deviceCapability-v3_3_0.xsd
index f347318..c4a1b0b 100644
--- a/v3_3_0/CDT-deviceCapability-v3_3_0.xsd
+++ b/v3_3_0/CDT-deviceCapability-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-deviceInfo-v3_3_0.xsd b/v3_3_0/CDT-deviceInfo-v3_3_0.xsd
index 16f708b..85597f9 100644
--- a/v3_3_0/CDT-deviceInfo-v3_3_0.xsd
+++ b/v3_3_0/CDT-deviceInfo-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-dynamicAuthorizationConsultation-v3_3_0.xsd b/v3_3_0/CDT-dynamicAuthorizationConsultation-v3_3_0.xsd
index ecc370a..4945e5e 100644
--- a/v3_3_0/CDT-dynamicAuthorizationConsultation-v3_3_0.xsd
+++ b/v3_3_0/CDT-dynamicAuthorizationConsultation-v3_3_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_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-eventConfig-v3_3_0.xsd b/v3_3_0/CDT-eventConfig-v3_3_0.xsd
index 681ff4b..c740383 100644
--- a/v3_3_0/CDT-eventConfig-v3_3_0.xsd
+++ b/v3_3_0/CDT-eventConfig-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-eventLog-v3_3_0.xsd b/v3_3_0/CDT-eventLog-v3_3_0.xsd
index 4024219..867ba51 100644
--- a/v3_3_0/CDT-eventLog-v3_3_0.xsd
+++ b/v3_3_0/CDT-eventLog-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-execInstance-v3_3_0.xsd b/v3_3_0/CDT-execInstance-v3_3_0.xsd
index c74d22e..04fad98 100644
--- a/v3_3_0/CDT-execInstance-v3_3_0.xsd
+++ b/v3_3_0/CDT-execInstance-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-firmware-v3_3_0.xsd b/v3_3_0/CDT-firmware-v3_3_0.xsd
index 118cce8..3f1ca74 100644
--- a/v3_3_0/CDT-firmware-v3_3_0.xsd
+++ b/v3_3_0/CDT-firmware-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-genericInterworkingOperationInstance-v3_3_0.xsd b/v3_3_0/CDT-genericInterworkingOperationInstance-v3_3_0.xsd
index 7a72d2e..09bbe13 100644
--- a/v3_3_0/CDT-genericInterworkingOperationInstance-v3_3_0.xsd
+++ b/v3_3_0/CDT-genericInterworkingOperationInstance-v3_3_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_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<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:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-genericInterworkingService-v3_3_0.xsd b/v3_3_0/CDT-genericInterworkingService-v3_3_0.xsd
index 1c67f61..053a095 100644
--- a/v3_3_0/CDT-genericInterworkingService-v3_3_0.xsd
+++ b/v3_3_0/CDT-genericInterworkingService-v3_3_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_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_2_0.xsd" />
+	<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:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-group-v3_3_0.xsd b/v3_3_0/CDT-group-v3_3_0.xsd
index 17361e1..52d62de 100644
--- a/v3_3_0/CDT-group-v3_3_0.xsd
+++ b/v3_3_0/CDT-group-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
+	<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:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-locationPolicy-v3_3_0.xsd b/v3_3_0/CDT-locationPolicy-v3_3_0.xsd
index 0ffac72..4c817bb 100644
--- a/v3_3_0/CDT-locationPolicy-v3_3_0.xsd
+++ b/v3_3_0/CDT-locationPolicy-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-m2mServiceSubscriptionProfile-v3_3_0.xsd b/v3_3_0/CDT-m2mServiceSubscriptionProfile-v3_3_0.xsd
index ebceb5d..067966f 100644
--- a/v3_3_0/CDT-m2mServiceSubscriptionProfile-v3_3_0.xsd
+++ b/v3_3_0/CDT-m2mServiceSubscriptionProfile-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_2_0.xsd" />
+	<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:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-memory-v3_3_0.xsd b/v3_3_0/CDT-memory-v3_3_0.xsd
index c64af9c..5c47de0 100644
--- a/v3_3_0/CDT-memory-v3_3_0.xsd
+++ b/v3_3_0/CDT-memory-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-mgmtCmd-v3_3_0.xsd b/v3_3_0/CDT-mgmtCmd-v3_3_0.xsd
index 9e6671e..90fc2cf 100644
--- a/v3_3_0/CDT-mgmtCmd-v3_3_0.xsd
+++ b/v3_3_0/CDT-mgmtCmd-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_2_0.xsd" />
+	<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:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-node-v3_3_0.xsd b/v3_3_0/CDT-node-v3_3_0.xsd
index fe7c6a2..4589343 100644
--- a/v3_3_0/CDT-node-v3_3_0.xsd
+++ b/v3_3_0/CDT-node-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_2_0.xsd" />
+	<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:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-notification-v3_3_0.xsd b/v3_3_0/CDT-notification-v3_3_0.xsd
index 3597670..0ae6d1c 100644
--- a/v3_3_0/CDT-notification-v3_3_0.xsd
+++ b/v3_3_0/CDT-notification-v3_3_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_2_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_2_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_3_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_3_0/CDT-notificationTargetMgmtPolicyRef-v3_3_0.xsd b/v3_3_0/CDT-notificationTargetMgmtPolicyRef-v3_3_0.xsd
index b45fac6..bbb2b5d 100644
--- a/v3_3_0/CDT-notificationTargetMgmtPolicyRef-v3_3_0.xsd
+++ b/v3_3_0/CDT-notificationTargetMgmtPolicyRef-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-notificationTargetPolicy-v3_3_0.xsd b/v3_3_0/CDT-notificationTargetPolicy-v3_3_0.xsd
index 896e695..5df81c0 100644
--- a/v3_3_0/CDT-notificationTargetPolicy-v3_3_0.xsd
+++ b/v3_3_0/CDT-notificationTargetPolicy-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<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:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-policyDeletionRules-v3_3_0.xsd b/v3_3_0/CDT-policyDeletionRules-v3_3_0.xsd
index e1fa461..5714709 100644
--- a/v3_3_0/CDT-policyDeletionRules-v3_3_0.xsd
+++ b/v3_3_0/CDT-policyDeletionRules-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-pollingChannel-v3_3_0.xsd b/v3_3_0/CDT-pollingChannel-v3_3_0.xsd
index a25a7a3..5a0463a 100644
--- a/v3_3_0/CDT-pollingChannel-v3_3_0.xsd
+++ b/v3_3_0/CDT-pollingChannel-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-reboot-v3_3_0.xsd b/v3_3_0/CDT-reboot-v3_3_0.xsd
index 81b47e9..9e6fe78 100644
--- a/v3_3_0/CDT-reboot-v3_3_0.xsd
+++ b/v3_3_0/CDT-reboot-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-remoteCSE-v3_3_0.xsd b/v3_3_0/CDT-remoteCSE-v3_3_0.xsd
index 8a93aa3..ab9ebde 100644
--- a/v3_3_0/CDT-remoteCSE-v3_3_0.xsd
+++ b/v3_3_0/CDT-remoteCSE-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_2_0.xsd" />
+	<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:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-request-v3_3_0.xsd b/v3_3_0/CDT-request-v3_3_0.xsd
index 8f843fd..6671866 100644
--- a/v3_3_0/CDT-request-v3_3_0.xsd
+++ b/v3_3_0/CDT-request-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-requestPrimitive-v3_3_0.xsd b/v3_3_0/CDT-requestPrimitive-v3_3_0.xsd
index 41f8b17..132aef5 100644
--- a/v3_3_0/CDT-requestPrimitive-v3_3_0.xsd
+++ b/v3_3_0/CDT-requestPrimitive-v3_3_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_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_3_0/CDT-responsePrimitive-v3_3_0.xsd b/v3_3_0/CDT-responsePrimitive-v3_3_0.xsd
index 4c93d1a..4e99560 100644
--- a/v3_3_0/CDT-responsePrimitive-v3_3_0.xsd
+++ b/v3_3_0/CDT-responsePrimitive-v3_3_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_2_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_2_0.xsd" />
+  <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:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_3_0/CDT-role-v3_3_0.xsd b/v3_3_0/CDT-role-v3_3_0.xsd
index c8be01b..d874d1f 100644
--- a/v3_3_0/CDT-role-v3_3_0.xsd
+++ b/v3_3_0/CDT-role-v3_3_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_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-schedule-v3_3_0.xsd b/v3_3_0/CDT-schedule-v3_3_0.xsd
index 53e1cba..d9feab7 100644
--- a/v3_3_0/CDT-schedule-v3_3_0.xsd
+++ b/v3_3_0/CDT-schedule-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-semanticDescriptor-v3_3_0.xsd b/v3_3_0/CDT-semanticDescriptor-v3_3_0.xsd
index dca67f4..0982325 100644
--- a/v3_3_0/CDT-semanticDescriptor-v3_3_0.xsd
+++ b/v3_3_0/CDT-semanticDescriptor-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-serviceSubscribedAppRule-v3_3_0.xsd b/v3_3_0/CDT-serviceSubscribedAppRule-v3_3_0.xsd
index abe851a..d37b64a 100644
--- a/v3_3_0/CDT-serviceSubscribedAppRule-v3_3_0.xsd
+++ b/v3_3_0/CDT-serviceSubscribedAppRule-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-serviceSubscribedNode-v3_3_0.xsd b/v3_3_0/CDT-serviceSubscribedNode-v3_3_0.xsd
index 3c2cb15..e16598b 100644
--- a/v3_3_0/CDT-serviceSubscribedNode-v3_3_0.xsd
+++ b/v3_3_0/CDT-serviceSubscribedNode-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-software-v3_3_0.xsd b/v3_3_0/CDT-software-v3_3_0.xsd
index 6e1f503..acd62d0 100644
--- a/v3_3_0/CDT-software-v3_3_0.xsd
+++ b/v3_3_0/CDT-software-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-statsCollect-v3_3_0.xsd b/v3_3_0/CDT-statsCollect-v3_3_0.xsd
index 401e551..442d51f 100644
--- a/v3_3_0/CDT-statsCollect-v3_3_0.xsd
+++ b/v3_3_0/CDT-statsCollect-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-statsConfig-v3_3_0.xsd b/v3_3_0/CDT-statsConfig-v3_3_0.xsd
index 38547ed..a24609b 100644
--- a/v3_3_0/CDT-statsConfig-v3_3_0.xsd
+++ b/v3_3_0/CDT-statsConfig-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<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:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-subscription-v3_3_0.xsd b/v3_3_0/CDT-subscription-v3_3_0.xsd
index 2193822..40a0519 100644
--- a/v3_3_0/CDT-subscription-v3_3_0.xsd
+++ b/v3_3_0/CDT-subscription-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_2_0.xsd" />
+	<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:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-svcFwWrapper-v3_3_0.xsd b/v3_3_0/CDT-svcFwWrapper-v3_3_0.xsd
index cafb6eb..788f54c 100644
--- a/v3_3_0/CDT-svcFwWrapper-v3_3_0.xsd
+++ b/v3_3_0/CDT-svcFwWrapper-v3_3_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_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<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:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-svcObjWrapper-v3_3_0.xsd b/v3_3_0/CDT-svcObjWrapper-v3_3_0.xsd
index 216f6df..6b147cc 100644
--- a/v3_3_0/CDT-svcObjWrapper-v3_3_0.xsd
+++ b/v3_3_0/CDT-svcObjWrapper-v3_3_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_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_2_0.xsd" />
+	<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:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-timeSeries-v3_3_0.xsd b/v3_3_0/CDT-timeSeries-v3_3_0.xsd
index 74e53c4..aec8b86 100644
--- a/v3_3_0/CDT-timeSeries-v3_3_0.xsd
+++ b/v3_3_0/CDT-timeSeries-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
+	<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:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_3_0/CDT-timeSeriesInstance-v3_3_0.xsd b/v3_3_0/CDT-timeSeriesInstance-v3_3_0.xsd
index 1f787d7..2f1982f 100644
--- a/v3_3_0/CDT-timeSeriesInstance-v3_3_0.xsd
+++ b/v3_3_0/CDT-timeSeriesInstance-v3_3_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_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-token-v3_3_0.xsd b/v3_3_0/CDT-token-v3_3_0.xsd
index c08a407..1588867 100644
--- a/v3_3_0/CDT-token-v3_3_0.xsd
+++ b/v3_3_0/CDT-token-v3_3_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_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-trafficPattern-v3_3_0.xsd b/v3_3_0/CDT-trafficPattern-v3_3_0.xsd
index 93e8d44..01163eb 100644
--- a/v3_3_0/CDT-trafficPattern-v3_3_0.xsd
+++ b/v3_3_0/CDT-trafficPattern-v3_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_2_0.xsd" />
+	<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:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab