From db33eb49228d5e848d8055141c0294775b9566cf Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Fri, 2 Jun 2017 16:44:33 +0200
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v3_2_0/CDT-AE-v3_2_0.xsd b/v3_2_0/CDT-AE-v3_2_0.xsd
index e142163..d9793be 100644
--- a/v3_2_0/CDT-AE-v3_2_0.xsd
+++ b/v3_2_0/CDT-AE-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_1_0.xsd" />
+	<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:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-CSEBase-v3_2_0.xsd b/v3_2_0/CDT-CSEBase-v3_2_0.xsd
index ed39c46..86eeb6d 100644
--- a/v3_2_0/CDT-CSEBase-v3_2_0.xsd
+++ b/v3_2_0/CDT-CSEBase-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_1_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_1_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_1_0.xsd" />
+	<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:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-accessControlPolicy-v3_2_0.xsd b/v3_2_0/CDT-accessControlPolicy-v3_2_0.xsd
index 64598ca..d5656d8 100644
--- a/v3_2_0/CDT-accessControlPolicy-v3_2_0.xsd
+++ b/v3_2_0/CDT-accessControlPolicy-v3_2_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_1_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-activeCmdhPolicy-v3_2_0.xsd b/v3_2_0/CDT-activeCmdhPolicy-v3_2_0.xsd
index ca4e584..620f1fc 100644
--- a/v3_2_0/CDT-activeCmdhPolicy-v3_2_0.xsd
+++ b/v3_2_0/CDT-activeCmdhPolicy-v3_2_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_1_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_2_0/CDT-allJoynApp-v3_2_0.xsd b/v3_2_0/CDT-allJoynApp-v3_2_0.xsd
index cfb6286..8adeb63 100644
--- a/v3_2_0/CDT-allJoynApp-v3_2_0.xsd
+++ b/v3_2_0/CDT-allJoynApp-v3_2_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_1_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_1_0.xsd" />
+	<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:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-allJoynInterface-v3_2_0.xsd b/v3_2_0/CDT-allJoynInterface-v3_2_0.xsd
index b577379..45ac7a0 100644
--- a/v3_2_0/CDT-allJoynInterface-v3_2_0.xsd
+++ b/v3_2_0/CDT-allJoynInterface-v3_2_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_1_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
+	<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:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_2_0/CDT-allJoynMethod-v3_2_0.xsd b/v3_2_0/CDT-allJoynMethod-v3_2_0.xsd
index 69f859c..67a76c7 100644
--- a/v3_2_0/CDT-allJoynMethod-v3_2_0.xsd
+++ b/v3_2_0/CDT-allJoynMethod-v3_2_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_1_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_1_0.xsd" />
+	<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:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_2_0/CDT-allJoynMethodCall-v3_2_0.xsd b/v3_2_0/CDT-allJoynMethodCall-v3_2_0.xsd
index 68765ce..97c2ea6 100644
--- a/v3_2_0/CDT-allJoynMethodCall-v3_2_0.xsd
+++ b/v3_2_0/CDT-allJoynMethodCall-v3_2_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_1_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<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:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-allJoynProperty-v3_2_0.xsd b/v3_2_0/CDT-allJoynProperty-v3_2_0.xsd
index 6a2c84a..1563689 100644
--- a/v3_2_0/CDT-allJoynProperty-v3_2_0.xsd
+++ b/v3_2_0/CDT-allJoynProperty-v3_2_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_1_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<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:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-allJoynSvcObject-v3_2_0.xsd b/v3_2_0/CDT-allJoynSvcObject-v3_2_0.xsd
index c84b2ae..1998697 100644
--- a/v3_2_0/CDT-allJoynSvcObject-v3_2_0.xsd
+++ b/v3_2_0/CDT-allJoynSvcObject-v3_2_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_1_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_1_0.xsd" />
+	<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:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-areaNwkDeviceInfo-v3_2_0.xsd b/v3_2_0/CDT-areaNwkDeviceInfo-v3_2_0.xsd
index b9e14b1..0144f80 100644
--- a/v3_2_0/CDT-areaNwkDeviceInfo-v3_2_0.xsd
+++ b/v3_2_0/CDT-areaNwkDeviceInfo-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-areaNwkInfo-v3_2_0.xsd b/v3_2_0/CDT-areaNwkInfo-v3_2_0.xsd
index b57ee33..7243119 100644
--- a/v3_2_0/CDT-areaNwkInfo-v3_2_0.xsd
+++ b/v3_2_0/CDT-areaNwkInfo-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-battery-v3_2_0.xsd b/v3_2_0/CDT-battery-v3_2_0.xsd
index 3b14cff..b269020 100644
--- a/v3_2_0/CDT-battery-v3_2_0.xsd
+++ b/v3_2_0/CDT-battery-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-cmdhBuffer-v3_2_0.xsd b/v3_2_0/CDT-cmdhBuffer-v3_2_0.xsd
index 72c3661..c5de99b 100644
--- a/v3_2_0/CDT-cmdhBuffer-v3_2_0.xsd
+++ b/v3_2_0/CDT-cmdhBuffer-v3_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_2_0/CDT-cmdhDefEcValue-v3_2_0.xsd b/v3_2_0/CDT-cmdhDefEcValue-v3_2_0.xsd
index 1dd6a77..efc4a47 100644
--- a/v3_2_0/CDT-cmdhDefEcValue-v3_2_0.xsd
+++ b/v3_2_0/CDT-cmdhDefEcValue-v3_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_2_0/CDT-cmdhDefaults-v3_2_0.xsd b/v3_2_0/CDT-cmdhDefaults-v3_2_0.xsd
index 0279336..9154b5c 100644
--- a/v3_2_0/CDT-cmdhDefaults-v3_2_0.xsd
+++ b/v3_2_0/CDT-cmdhDefaults-v3_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_2_0/CDT-cmdhEcDefParamValues-v3_2_0.xsd b/v3_2_0/CDT-cmdhEcDefParamValues-v3_2_0.xsd
index d6ba56e..9a57d3d 100644
--- a/v3_2_0/CDT-cmdhEcDefParamValues-v3_2_0.xsd
+++ b/v3_2_0/CDT-cmdhEcDefParamValues-v3_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_2_0/CDT-cmdhLimits-v3_2_0.xsd b/v3_2_0/CDT-cmdhLimits-v3_2_0.xsd
index 9e4cef6..ed9c984 100644
--- a/v3_2_0/CDT-cmdhLimits-v3_2_0.xsd
+++ b/v3_2_0/CDT-cmdhLimits-v3_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_2_0/CDT-cmdhNetworkAccessRules-v3_2_0.xsd b/v3_2_0/CDT-cmdhNetworkAccessRules-v3_2_0.xsd
index dcd9572..75265c5 100644
--- a/v3_2_0/CDT-cmdhNetworkAccessRules-v3_2_0.xsd
+++ b/v3_2_0/CDT-cmdhNetworkAccessRules-v3_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_2_0/CDT-cmdhNwAccessRule-v3_2_0.xsd b/v3_2_0/CDT-cmdhNwAccessRule-v3_2_0.xsd
index 7c50fb1..5fdadea 100644
--- a/v3_2_0/CDT-cmdhNwAccessRule-v3_2_0.xsd
+++ b/v3_2_0/CDT-cmdhNwAccessRule-v3_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_2_0/CDT-cmdhPolicy-v3_2_0.xsd b/v3_2_0/CDT-cmdhPolicy-v3_2_0.xsd
index c4d0482..581578a 100644
--- a/v3_2_0/CDT-cmdhPolicy-v3_2_0.xsd
+++ b/v3_2_0/CDT-cmdhPolicy-v3_2_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_1_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_2_0/CDT-commonTypes-v3_2_0.xsd b/v3_2_0/CDT-commonTypes-v3_2_0.xsd
index 5f1dc8d..e4a8bf3 100644
--- a/v3_2_0/CDT-commonTypes-v3_2_0.xsd
+++ b/v3_2_0/CDT-commonTypes-v3_2_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_1_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_2_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_2_0/CDT-container-v3_2_0.xsd b/v3_2_0/CDT-container-v3_2_0.xsd
index 32c0525..b68ee9c 100644
--- a/v3_2_0/CDT-container-v3_2_0.xsd
+++ b/v3_2_0/CDT-container-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<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:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_2_0/CDT-contentInstance-v3_2_0.xsd b/v3_2_0/CDT-contentInstance-v3_2_0.xsd
index d876dae..0503ba8 100644
--- a/v3_2_0/CDT-contentInstance-v3_2_0.xsd
+++ b/v3_2_0/CDT-contentInstance-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-delivery-v3_2_0.xsd b/v3_2_0/CDT-delivery-v3_2_0.xsd
index 57382b4..db57b7a 100644
--- a/v3_2_0/CDT-delivery-v3_2_0.xsd
+++ b/v3_2_0/CDT-delivery-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_2_0/CDT-deviceCapability-v3_2_0.xsd b/v3_2_0/CDT-deviceCapability-v3_2_0.xsd
index 9f3364f..f347318 100644
--- a/v3_2_0/CDT-deviceCapability-v3_2_0.xsd
+++ b/v3_2_0/CDT-deviceCapability-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-deviceInfo-v3_2_0.xsd b/v3_2_0/CDT-deviceInfo-v3_2_0.xsd
index 46afdd8..16f708b 100644
--- a/v3_2_0/CDT-deviceInfo-v3_2_0.xsd
+++ b/v3_2_0/CDT-deviceInfo-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-dynamicAuthorizationConsultation-v3_2_0.xsd b/v3_2_0/CDT-dynamicAuthorizationConsultation-v3_2_0.xsd
index f41809a..ecc370a 100644
--- a/v3_2_0/CDT-dynamicAuthorizationConsultation-v3_2_0.xsd
+++ b/v3_2_0/CDT-dynamicAuthorizationConsultation-v3_2_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_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-eventConfig-v3_2_0.xsd b/v3_2_0/CDT-eventConfig-v3_2_0.xsd
index 273f46b..681ff4b 100644
--- a/v3_2_0/CDT-eventConfig-v3_2_0.xsd
+++ b/v3_2_0/CDT-eventConfig-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-eventLog-v3_2_0.xsd b/v3_2_0/CDT-eventLog-v3_2_0.xsd
index b8c9883..4024219 100644
--- a/v3_2_0/CDT-eventLog-v3_2_0.xsd
+++ b/v3_2_0/CDT-eventLog-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-execInstance-v3_2_0.xsd b/v3_2_0/CDT-execInstance-v3_2_0.xsd
index ec4ee31..c74d22e 100644
--- a/v3_2_0/CDT-execInstance-v3_2_0.xsd
+++ b/v3_2_0/CDT-execInstance-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-firmware-v3_2_0.xsd b/v3_2_0/CDT-firmware-v3_2_0.xsd
index 10a3c06..118cce8 100644
--- a/v3_2_0/CDT-firmware-v3_2_0.xsd
+++ b/v3_2_0/CDT-firmware-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-genericInterworkingOperationInstance-v3_2_0.xsd b/v3_2_0/CDT-genericInterworkingOperationInstance-v3_2_0.xsd
index d6864d9..7a72d2e 100644
--- a/v3_2_0/CDT-genericInterworkingOperationInstance-v3_2_0.xsd
+++ b/v3_2_0/CDT-genericInterworkingOperationInstance-v3_2_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_1_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<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:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-genericInterworkingService-v3_2_0.xsd b/v3_2_0/CDT-genericInterworkingService-v3_2_0.xsd
index 589530c..1c67f61 100644
--- a/v3_2_0/CDT-genericInterworkingService-v3_2_0.xsd
+++ b/v3_2_0/CDT-genericInterworkingService-v3_2_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_1_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_1_0.xsd" />
+	<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:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-group-v3_2_0.xsd b/v3_2_0/CDT-group-v3_2_0.xsd
index f4a4a0c..17361e1 100644
--- a/v3_2_0/CDT-group-v3_2_0.xsd
+++ b/v3_2_0/CDT-group-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<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:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-locationPolicy-v3_2_0.xsd b/v3_2_0/CDT-locationPolicy-v3_2_0.xsd
index 098530a..0ffac72 100644
--- a/v3_2_0/CDT-locationPolicy-v3_2_0.xsd
+++ b/v3_2_0/CDT-locationPolicy-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-m2mServiceSubscriptionProfile-v3_2_0.xsd b/v3_2_0/CDT-m2mServiceSubscriptionProfile-v3_2_0.xsd
index c9ce59c..ebceb5d 100644
--- a/v3_2_0/CDT-m2mServiceSubscriptionProfile-v3_2_0.xsd
+++ b/v3_2_0/CDT-m2mServiceSubscriptionProfile-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_1_0.xsd" />
+	<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:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-memory-v3_2_0.xsd b/v3_2_0/CDT-memory-v3_2_0.xsd
index 43ef25b..c64af9c 100644
--- a/v3_2_0/CDT-memory-v3_2_0.xsd
+++ b/v3_2_0/CDT-memory-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-mgmtCmd-v3_2_0.xsd b/v3_2_0/CDT-mgmtCmd-v3_2_0.xsd
index 67c3c7a..9e6671e 100644
--- a/v3_2_0/CDT-mgmtCmd-v3_2_0.xsd
+++ b/v3_2_0/CDT-mgmtCmd-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_1_0.xsd" />
+	<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:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-node-v3_2_0.xsd b/v3_2_0/CDT-node-v3_2_0.xsd
index 85d04a2..fe7c6a2 100644
--- a/v3_2_0/CDT-node-v3_2_0.xsd
+++ b/v3_2_0/CDT-node-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_1_0.xsd" />
+	<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:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-notification-v3_2_0.xsd b/v3_2_0/CDT-notification-v3_2_0.xsd
index 850e6b6..3597670 100644
--- a/v3_2_0/CDT-notification-v3_2_0.xsd
+++ b/v3_2_0/CDT-notification-v3_2_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_1_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_1_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_2_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_2_0/CDT-notificationTargetMgmtPolicyRef-v3_2_0.xsd b/v3_2_0/CDT-notificationTargetMgmtPolicyRef-v3_2_0.xsd
index ef96023..b45fac6 100644
--- a/v3_2_0/CDT-notificationTargetMgmtPolicyRef-v3_2_0.xsd
+++ b/v3_2_0/CDT-notificationTargetMgmtPolicyRef-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-notificationTargetPolicy-v3_2_0.xsd b/v3_2_0/CDT-notificationTargetPolicy-v3_2_0.xsd
index 9d5b497..896e695 100644
--- a/v3_2_0/CDT-notificationTargetPolicy-v3_2_0.xsd
+++ b/v3_2_0/CDT-notificationTargetPolicy-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<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:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-policyDeletionRules-v3_2_0.xsd b/v3_2_0/CDT-policyDeletionRules-v3_2_0.xsd
index 99f65f0..e1fa461 100644
--- a/v3_2_0/CDT-policyDeletionRules-v3_2_0.xsd
+++ b/v3_2_0/CDT-policyDeletionRules-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-pollingChannel-v3_2_0.xsd b/v3_2_0/CDT-pollingChannel-v3_2_0.xsd
index c22bc4f..a25a7a3 100644
--- a/v3_2_0/CDT-pollingChannel-v3_2_0.xsd
+++ b/v3_2_0/CDT-pollingChannel-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-reboot-v3_2_0.xsd b/v3_2_0/CDT-reboot-v3_2_0.xsd
index caa3810..81b47e9 100644
--- a/v3_2_0/CDT-reboot-v3_2_0.xsd
+++ b/v3_2_0/CDT-reboot-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-remoteCSE-v3_2_0.xsd b/v3_2_0/CDT-remoteCSE-v3_2_0.xsd
index 3ff9cb2..8a93aa3 100644
--- a/v3_2_0/CDT-remoteCSE-v3_2_0.xsd
+++ b/v3_2_0/CDT-remoteCSE-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_1_0.xsd" />
+	<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:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-request-v3_2_0.xsd b/v3_2_0/CDT-request-v3_2_0.xsd
index c637e4b..8f843fd 100644
--- a/v3_2_0/CDT-request-v3_2_0.xsd
+++ b/v3_2_0/CDT-request-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-requestPrimitive-v3_2_0.xsd b/v3_2_0/CDT-requestPrimitive-v3_2_0.xsd
index 715a7ee..41f8b17 100644
--- a/v3_2_0/CDT-requestPrimitive-v3_2_0.xsd
+++ b/v3_2_0/CDT-requestPrimitive-v3_2_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_1_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_2_0/CDT-responsePrimitive-v3_2_0.xsd b/v3_2_0/CDT-responsePrimitive-v3_2_0.xsd
index e8fe22c..4c93d1a 100644
--- a/v3_2_0/CDT-responsePrimitive-v3_2_0.xsd
+++ b/v3_2_0/CDT-responsePrimitive-v3_2_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_1_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_1_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_1_0.xsd" />
+  <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:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_2_0/CDT-role-v3_2_0.xsd b/v3_2_0/CDT-role-v3_2_0.xsd
index 7232079..c8be01b 100644
--- a/v3_2_0/CDT-role-v3_2_0.xsd
+++ b/v3_2_0/CDT-role-v3_2_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_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-schedule-v3_2_0.xsd b/v3_2_0/CDT-schedule-v3_2_0.xsd
index 17bb691..53e1cba 100644
--- a/v3_2_0/CDT-schedule-v3_2_0.xsd
+++ b/v3_2_0/CDT-schedule-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-semanticDescriptor-v3_2_0.xsd b/v3_2_0/CDT-semanticDescriptor-v3_2_0.xsd
index 3973249..dca67f4 100644
--- a/v3_2_0/CDT-semanticDescriptor-v3_2_0.xsd
+++ b/v3_2_0/CDT-semanticDescriptor-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-serviceSubscribedAppRule-v3_2_0.xsd b/v3_2_0/CDT-serviceSubscribedAppRule-v3_2_0.xsd
index ddea8d1..abe851a 100644
--- a/v3_2_0/CDT-serviceSubscribedAppRule-v3_2_0.xsd
+++ b/v3_2_0/CDT-serviceSubscribedAppRule-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-serviceSubscribedNode-v3_2_0.xsd b/v3_2_0/CDT-serviceSubscribedNode-v3_2_0.xsd
index a4c5ef3..3c2cb15 100644
--- a/v3_2_0/CDT-serviceSubscribedNode-v3_2_0.xsd
+++ b/v3_2_0/CDT-serviceSubscribedNode-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-software-v3_2_0.xsd b/v3_2_0/CDT-software-v3_2_0.xsd
index 24eec1c..6e1f503 100644
--- a/v3_2_0/CDT-software-v3_2_0.xsd
+++ b/v3_2_0/CDT-software-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-statsCollect-v3_2_0.xsd b/v3_2_0/CDT-statsCollect-v3_2_0.xsd
index fe51452..401e551 100644
--- a/v3_2_0/CDT-statsCollect-v3_2_0.xsd
+++ b/v3_2_0/CDT-statsCollect-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-statsConfig-v3_2_0.xsd b/v3_2_0/CDT-statsConfig-v3_2_0.xsd
index dec5df5..38547ed 100644
--- a/v3_2_0/CDT-statsConfig-v3_2_0.xsd
+++ b/v3_2_0/CDT-statsConfig-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<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:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-subscription-v3_2_0.xsd b/v3_2_0/CDT-subscription-v3_2_0.xsd
index 16a9cdd..9171266 100644
--- a/v3_2_0/CDT-subscription-v3_2_0.xsd
+++ b/v3_2_0/CDT-subscription-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_1_0.xsd" />
+	<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:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-svcFwWrapper-v3_2_0.xsd b/v3_2_0/CDT-svcFwWrapper-v3_2_0.xsd
index dd2acf6..cafb6eb 100644
--- a/v3_2_0/CDT-svcFwWrapper-v3_2_0.xsd
+++ b/v3_2_0/CDT-svcFwWrapper-v3_2_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_1_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<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:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-svcObjWrapper-v3_2_0.xsd b/v3_2_0/CDT-svcObjWrapper-v3_2_0.xsd
index 562223d..216f6df 100644
--- a/v3_2_0/CDT-svcObjWrapper-v3_2_0.xsd
+++ b/v3_2_0/CDT-svcObjWrapper-v3_2_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_1_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_1_0.xsd" />
+	<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:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-timeSeries-v3_2_0.xsd b/v3_2_0/CDT-timeSeries-v3_2_0.xsd
index 23c5dba..74e53c4 100644
--- a/v3_2_0/CDT-timeSeries-v3_2_0.xsd
+++ b/v3_2_0/CDT-timeSeries-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<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:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_2_0/CDT-timeSeriesInstance-v3_2_0.xsd b/v3_2_0/CDT-timeSeriesInstance-v3_2_0.xsd
index 7919310..1f787d7 100644
--- a/v3_2_0/CDT-timeSeriesInstance-v3_2_0.xsd
+++ b/v3_2_0/CDT-timeSeriesInstance-v3_2_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_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-token-v3_2_0.xsd b/v3_2_0/CDT-token-v3_2_0.xsd
index 0a2f6bd..c08a407 100644
--- a/v3_2_0/CDT-token-v3_2_0.xsd
+++ b/v3_2_0/CDT-token-v3_2_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_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_2_0/CDT-trafficPattern-v3_2_0.xsd b/v3_2_0/CDT-trafficPattern-v3_2_0.xsd
index 05fda4a..93e8d44 100644
--- a/v3_2_0/CDT-trafficPattern-v3_2_0.xsd
+++ b/v3_2_0/CDT-trafficPattern-v3_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
+	<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:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab