From b1c95f4d15195fcf7fb71fd3d70cf6e872b6c867 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Wed, 17 Apr 2019 12:44:39 +0200
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v2_21_0/CDT-AE-v2_21_0.xsd b/v2_21_0/CDT-AE-v2_21_0.xsd
index 5757a92..d0f74f9 100644
--- a/v2_21_0/CDT-AE-v2_21_0.xsd
+++ b/v2_21_0/CDT-AE-v2_21_0.xsd
@@ -26,16 +26,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_21_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-CSEBase-v2_21_0.xsd b/v2_21_0/CDT-CSEBase-v2_21_0.xsd
index be3455d..c5b5d63 100644
--- a/v2_21_0/CDT-CSEBase-v2_21_0.xsd
+++ b/v2_21_0/CDT-CSEBase-v2_21_0.xsd
@@ -26,26 +26,26 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_20_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_20_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_21_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v2_21_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v2_21_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-accessControlPolicy-v2_21_0.xsd b/v2_21_0/CDT-accessControlPolicy-v2_21_0.xsd
index 6dc4aae..e80a4c7 100644
--- a/v2_21_0/CDT-accessControlPolicy-v2_21_0.xsd
+++ b/v2_21_0/CDT-accessControlPolicy-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-activeCmdhPolicy-v2_21_0.xsd b/v2_21_0/CDT-activeCmdhPolicy-v2_21_0.xsd
index 3721d99..8f8acd7 100644
--- a/v2_21_0/CDT-activeCmdhPolicy-v2_21_0.xsd
+++ b/v2_21_0/CDT-activeCmdhPolicy-v2_21_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-    <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_21_0/CDT-allJoynApp-v2_21_0.xsd b/v2_21_0/CDT-allJoynApp-v2_21_0.xsd
index 44dab41..6147020 100644
--- a/v2_21_0/CDT-allJoynApp-v2_21_0.xsd
+++ b/v2_21_0/CDT-allJoynApp-v2_21_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_21_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-allJoynInterface-v2_21_0.xsd b/v2_21_0/CDT-allJoynInterface-v2_21_0.xsd
index 6f9c8fa..051db65 100644
--- a/v2_21_0/CDT-allJoynInterface-v2_21_0.xsd
+++ b/v2_21_0/CDT-allJoynInterface-v2_21_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_21_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_21_0/CDT-allJoynMethod-v2_21_0.xsd b/v2_21_0/CDT-allJoynMethod-v2_21_0.xsd
index d0408cd..d157ee4 100644
--- a/v2_21_0/CDT-allJoynMethod-v2_21_0.xsd
+++ b/v2_21_0/CDT-allJoynMethod-v2_21_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_21_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_21_0/CDT-allJoynMethodCall-v2_21_0.xsd b/v2_21_0/CDT-allJoynMethodCall-v2_21_0.xsd
index c6f9957..d350269 100644
--- a/v2_21_0/CDT-allJoynMethodCall-v2_21_0.xsd
+++ b/v2_21_0/CDT-allJoynMethodCall-v2_21_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-allJoynProperty-v2_21_0.xsd b/v2_21_0/CDT-allJoynProperty-v2_21_0.xsd
index 4eff8b4..592a05f 100644
--- a/v2_21_0/CDT-allJoynProperty-v2_21_0.xsd
+++ b/v2_21_0/CDT-allJoynProperty-v2_21_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-allJoynSvcObject-v2_21_0.xsd b/v2_21_0/CDT-allJoynSvcObject-v2_21_0.xsd
index e4a4061..5e79bb1 100644
--- a/v2_21_0/CDT-allJoynSvcObject-v2_21_0.xsd
+++ b/v2_21_0/CDT-allJoynSvcObject-v2_21_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v2_21_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-areaNwkDeviceInfo-v2_21_0.xsd b/v2_21_0/CDT-areaNwkDeviceInfo-v2_21_0.xsd
index 9522c22..0ac3615 100644
--- a/v2_21_0/CDT-areaNwkDeviceInfo-v2_21_0.xsd
+++ b/v2_21_0/CDT-areaNwkDeviceInfo-v2_21_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-areaNwkInfo-v2_21_0.xsd b/v2_21_0/CDT-areaNwkInfo-v2_21_0.xsd
index 9692155..ddbf204 100644
--- a/v2_21_0/CDT-areaNwkInfo-v2_21_0.xsd
+++ b/v2_21_0/CDT-areaNwkInfo-v2_21_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-battery-v2_21_0.xsd b/v2_21_0/CDT-battery-v2_21_0.xsd
index 9cad9b8..4bf5d12 100644
--- a/v2_21_0/CDT-battery-v2_21_0.xsd
+++ b/v2_21_0/CDT-battery-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-cmdhBuffer-v2_21_0.xsd b/v2_21_0/CDT-cmdhBuffer-v2_21_0.xsd
index 3148be0..f990782 100644
--- a/v2_21_0/CDT-cmdhBuffer-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhBuffer-v2_21_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_21_0/CDT-cmdhDefEcValue-v2_21_0.xsd b/v2_21_0/CDT-cmdhDefEcValue-v2_21_0.xsd
index af4031d..d5e6ac6 100644
--- a/v2_21_0/CDT-cmdhDefEcValue-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhDefEcValue-v2_21_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_21_0/CDT-cmdhDefaults-v2_21_0.xsd b/v2_21_0/CDT-cmdhDefaults-v2_21_0.xsd
index 5d0b62f..16111ab 100644
--- a/v2_21_0/CDT-cmdhDefaults-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhDefaults-v2_21_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_21_0/CDT-cmdhEcDefParamValues-v2_21_0.xsd b/v2_21_0/CDT-cmdhEcDefParamValues-v2_21_0.xsd
index 43246db..5b36224 100644
--- a/v2_21_0/CDT-cmdhEcDefParamValues-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhEcDefParamValues-v2_21_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_21_0/CDT-cmdhLimits-v2_21_0.xsd b/v2_21_0/CDT-cmdhLimits-v2_21_0.xsd
index 44a76aa..5fc4db4 100644
--- a/v2_21_0/CDT-cmdhLimits-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhLimits-v2_21_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_21_0/CDT-cmdhNetworkAccessRules-v2_21_0.xsd b/v2_21_0/CDT-cmdhNetworkAccessRules-v2_21_0.xsd
index 4ce7695..f68635c 100644
--- a/v2_21_0/CDT-cmdhNetworkAccessRules-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhNetworkAccessRules-v2_21_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_21_0/CDT-cmdhNwAccessRule-v2_21_0.xsd b/v2_21_0/CDT-cmdhNwAccessRule-v2_21_0.xsd
index 7fbeaf8..4c2ed53 100644
--- a/v2_21_0/CDT-cmdhNwAccessRule-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhNwAccessRule-v2_21_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_21_0/CDT-cmdhPolicy-v2_21_0.xsd b/v2_21_0/CDT-cmdhPolicy-v2_21_0.xsd
index c80ef3c..1d9976c 100644
--- a/v2_21_0/CDT-cmdhPolicy-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhPolicy-v2_21_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_21_0/CDT-commonTypes-v2_21_0.xsd b/v2_21_0/CDT-commonTypes-v2_21_0.xsd
index 5ac40d1..35cd329 100644
--- a/v2_21_0/CDT-commonTypes-v2_21_0.xsd
+++ b/v2_21_0/CDT-commonTypes-v2_21_0.xsd
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_21_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_21_0/CDT-container-v2_21_0.xsd b/v2_21_0/CDT-container-v2_21_0.xsd
index 990b5f4..e1da425 100644
--- a/v2_21_0/CDT-container-v2_21_0.xsd
+++ b/v2_21_0/CDT-container-v2_21_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_21_0/CDT-contentInstance-v2_21_0.xsd b/v2_21_0/CDT-contentInstance-v2_21_0.xsd
index 9921ebc..e0e0d49 100644
--- a/v2_21_0/CDT-contentInstance-v2_21_0.xsd
+++ b/v2_21_0/CDT-contentInstance-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-delivery-v2_21_0.xsd b/v2_21_0/CDT-delivery-v2_21_0.xsd
index 0ac651c..fefacde 100644
--- a/v2_21_0/CDT-delivery-v2_21_0.xsd
+++ b/v2_21_0/CDT-delivery-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_21_0/CDT-deviceCapability-v2_21_0.xsd b/v2_21_0/CDT-deviceCapability-v2_21_0.xsd
index 2dbe368..a87bd74 100644
--- a/v2_21_0/CDT-deviceCapability-v2_21_0.xsd
+++ b/v2_21_0/CDT-deviceCapability-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-deviceInfo-v2_21_0.xsd b/v2_21_0/CDT-deviceInfo-v2_21_0.xsd
index 070f2a6..b9b3769 100644
--- a/v2_21_0/CDT-deviceInfo-v2_21_0.xsd
+++ b/v2_21_0/CDT-deviceInfo-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-dynamicAuthorizationConsultation-v2_21_0.xsd b/v2_21_0/CDT-dynamicAuthorizationConsultation-v2_21_0.xsd
index d8cc1bb..947ba44 100644
--- a/v2_21_0/CDT-dynamicAuthorizationConsultation-v2_21_0.xsd
+++ b/v2_21_0/CDT-dynamicAuthorizationConsultation-v2_21_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-eventConfig-v2_21_0.xsd b/v2_21_0/CDT-eventConfig-v2_21_0.xsd
index 5a8f2e6..9acac0d 100644
--- a/v2_21_0/CDT-eventConfig-v2_21_0.xsd
+++ b/v2_21_0/CDT-eventConfig-v2_21_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-eventLog-v2_21_0.xsd b/v2_21_0/CDT-eventLog-v2_21_0.xsd
index 86b6593..c01a85f 100644
--- a/v2_21_0/CDT-eventLog-v2_21_0.xsd
+++ b/v2_21_0/CDT-eventLog-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-execInstance-v2_21_0.xsd b/v2_21_0/CDT-execInstance-v2_21_0.xsd
index 6b2acfd..8f050db 100644
--- a/v2_21_0/CDT-execInstance-v2_21_0.xsd
+++ b/v2_21_0/CDT-execInstance-v2_21_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-firmware-v2_21_0.xsd b/v2_21_0/CDT-firmware-v2_21_0.xsd
index 3178930..38d53b8 100644
--- a/v2_21_0/CDT-firmware-v2_21_0.xsd
+++ b/v2_21_0/CDT-firmware-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-genericInterworkingOperationInstance-v2_21_0.xsd b/v2_21_0/CDT-genericInterworkingOperationInstance-v2_21_0.xsd
index f651391..8395263 100644
--- a/v2_21_0/CDT-genericInterworkingOperationInstance-v2_21_0.xsd
+++ b/v2_21_0/CDT-genericInterworkingOperationInstance-v2_21_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-genericInterworkingService-v2_21_0.xsd b/v2_21_0/CDT-genericInterworkingService-v2_21_0.xsd
index ccef567..aa7e48d 100644
--- a/v2_21_0/CDT-genericInterworkingService-v2_21_0.xsd
+++ b/v2_21_0/CDT-genericInterworkingService-v2_21_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_21_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-group-v2_21_0.xsd b/v2_21_0/CDT-group-v2_21_0.xsd
index 0aed183..44f6d47 100644
--- a/v2_21_0/CDT-group-v2_21_0.xsd
+++ b/v2_21_0/CDT-group-v2_21_0.xsd
@@ -29,9 +29,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd"/>
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-locationPolicy-v2_21_0.xsd b/v2_21_0/CDT-locationPolicy-v2_21_0.xsd
index 2221b77..3202e7d 100644
--- a/v2_21_0/CDT-locationPolicy-v2_21_0.xsd
+++ b/v2_21_0/CDT-locationPolicy-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-m2mServiceSubscriptionProfile-v2_21_0.xsd b/v2_21_0/CDT-m2mServiceSubscriptionProfile-v2_21_0.xsd
index ef85b32..3ba3c09 100644
--- a/v2_21_0/CDT-m2mServiceSubscriptionProfile-v2_21_0.xsd
+++ b/v2_21_0/CDT-m2mServiceSubscriptionProfile-v2_21_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_21_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-memory-v2_21_0.xsd b/v2_21_0/CDT-memory-v2_21_0.xsd
index b0fbd3b..0cad954 100644
--- a/v2_21_0/CDT-memory-v2_21_0.xsd
+++ b/v2_21_0/CDT-memory-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-mgmtCmd-v2_21_0.xsd b/v2_21_0/CDT-mgmtCmd-v2_21_0.xsd
index 53869ee..b259d3e 100644
--- a/v2_21_0/CDT-mgmtCmd-v2_21_0.xsd
+++ b/v2_21_0/CDT-mgmtCmd-v2_21_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_21_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-node-v2_21_0.xsd b/v2_21_0/CDT-node-v2_21_0.xsd
index 920547b..24a5f10 100644
--- a/v2_21_0/CDT-node-v2_21_0.xsd
+++ b/v2_21_0/CDT-node-v2_21_0.xsd
@@ -27,22 +27,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_21_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-notification-v2_21_0.xsd b/v2_21_0/CDT-notification-v2_21_0.xsd
index 6f2c4fb..995b592 100644
--- a/v2_21_0/CDT-notification-v2_21_0.xsd
+++ b/v2_21_0/CDT-notification-v2_21_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         targetNamespace="http://www.onem2m.org/xml/protocols"
         xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_20_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_21_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_21_0/CDT-notificationTargetMgmtPolicyRef-v2_21_0.xsd b/v2_21_0/CDT-notificationTargetMgmtPolicyRef-v2_21_0.xsd
index b468044..d54f3e4 100644
--- a/v2_21_0/CDT-notificationTargetMgmtPolicyRef-v2_21_0.xsd
+++ b/v2_21_0/CDT-notificationTargetMgmtPolicyRef-v2_21_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-notificationTargetPolicy-v2_21_0.xsd b/v2_21_0/CDT-notificationTargetPolicy-v2_21_0.xsd
index ce758e7..4afff9e 100644
--- a/v2_21_0/CDT-notificationTargetPolicy-v2_21_0.xsd
+++ b/v2_21_0/CDT-notificationTargetPolicy-v2_21_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-policyDeletionRules-v2_21_0.xsd b/v2_21_0/CDT-policyDeletionRules-v2_21_0.xsd
index c44ee0e..68c2514 100644
--- a/v2_21_0/CDT-policyDeletionRules-v2_21_0.xsd
+++ b/v2_21_0/CDT-policyDeletionRules-v2_21_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-pollingChannel-v2_21_0.xsd b/v2_21_0/CDT-pollingChannel-v2_21_0.xsd
index 5a5503e..0272296 100644
--- a/v2_21_0/CDT-pollingChannel-v2_21_0.xsd
+++ b/v2_21_0/CDT-pollingChannel-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-reboot-v2_21_0.xsd b/v2_21_0/CDT-reboot-v2_21_0.xsd
index a17bc20..4478ecc 100644
--- a/v2_21_0/CDT-reboot-v2_21_0.xsd
+++ b/v2_21_0/CDT-reboot-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-remoteCSE-v2_21_0.xsd b/v2_21_0/CDT-remoteCSE-v2_21_0.xsd
index 35fe39a..177fd5a 100644
--- a/v2_21_0/CDT-remoteCSE-v2_21_0.xsd
+++ b/v2_21_0/CDT-remoteCSE-v2_21_0.xsd
@@ -26,17 +26,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_21_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-request-v2_21_0.xsd b/v2_21_0/CDT-request-v2_21_0.xsd
index 7bda956..e15cf6b 100644
--- a/v2_21_0/CDT-request-v2_21_0.xsd
+++ b/v2_21_0/CDT-request-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-requestPrimitive-v2_21_0.xsd b/v2_21_0/CDT-requestPrimitive-v2_21_0.xsd
index 4996a1d..b98bd15 100644
--- a/v2_21_0/CDT-requestPrimitive-v2_21_0.xsd
+++ b/v2_21_0/CDT-requestPrimitive-v2_21_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_21_0/CDT-responsePrimitive-v2_21_0.xsd b/v2_21_0/CDT-responsePrimitive-v2_21_0.xsd
index 4b27d5d..0de72d7 100644
--- a/v2_21_0/CDT-responsePrimitive-v2_21_0.xsd
+++ b/v2_21_0/CDT-responsePrimitive-v2_21_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-v2_20_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_20_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_21_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_21_0/CDT-role-v2_21_0.xsd b/v2_21_0/CDT-role-v2_21_0.xsd
index 157b76f..a8af682 100644
--- a/v2_21_0/CDT-role-v2_21_0.xsd
+++ b/v2_21_0/CDT-role-v2_21_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-schedule-v2_21_0.xsd b/v2_21_0/CDT-schedule-v2_21_0.xsd
index 08e1a2d..3a1ba47 100644
--- a/v2_21_0/CDT-schedule-v2_21_0.xsd
+++ b/v2_21_0/CDT-schedule-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-semanticDescriptor-v2_21_0.xsd b/v2_21_0/CDT-semanticDescriptor-v2_21_0.xsd
index 06a7c92..0a8183b 100644
--- a/v2_21_0/CDT-semanticDescriptor-v2_21_0.xsd
+++ b/v2_21_0/CDT-semanticDescriptor-v2_21_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-serviceSubscribedAppRule-v2_21_0.xsd b/v2_21_0/CDT-serviceSubscribedAppRule-v2_21_0.xsd
index 2c71abe..2cead83 100644
--- a/v2_21_0/CDT-serviceSubscribedAppRule-v2_21_0.xsd
+++ b/v2_21_0/CDT-serviceSubscribedAppRule-v2_21_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-serviceSubscribedNode-v2_21_0.xsd b/v2_21_0/CDT-serviceSubscribedNode-v2_21_0.xsd
index b05cdc1..b50c5cd 100644
--- a/v2_21_0/CDT-serviceSubscribedNode-v2_21_0.xsd
+++ b/v2_21_0/CDT-serviceSubscribedNode-v2_21_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-software-v2_21_0.xsd b/v2_21_0/CDT-software-v2_21_0.xsd
index 1338549..aa3002f 100644
--- a/v2_21_0/CDT-software-v2_21_0.xsd
+++ b/v2_21_0/CDT-software-v2_21_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-statsCollect-v2_21_0.xsd b/v2_21_0/CDT-statsCollect-v2_21_0.xsd
index d36b35c..eb0f373 100644
--- a/v2_21_0/CDT-statsCollect-v2_21_0.xsd
+++ b/v2_21_0/CDT-statsCollect-v2_21_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-statsConfig-v2_21_0.xsd b/v2_21_0/CDT-statsConfig-v2_21_0.xsd
index 8f62d2d..a86420e 100644
--- a/v2_21_0/CDT-statsConfig-v2_21_0.xsd
+++ b/v2_21_0/CDT-statsConfig-v2_21_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-subscription-v2_21_0.xsd b/v2_21_0/CDT-subscription-v2_21_0.xsd
index 55439ea..ab329c5 100644
--- a/v2_21_0/CDT-subscription-v2_21_0.xsd
+++ b/v2_21_0/CDT-subscription-v2_21_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_21_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-svcFwWrapper-v2_21_0.xsd b/v2_21_0/CDT-svcFwWrapper-v2_21_0.xsd
index 22608ad..92e9c53 100644
--- a/v2_21_0/CDT-svcFwWrapper-v2_21_0.xsd
+++ b/v2_21_0/CDT-svcFwWrapper-v2_21_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-svcObjWrapper-v2_21_0.xsd b/v2_21_0/CDT-svcObjWrapper-v2_21_0.xsd
index a6b1c91..96efacc 100644
--- a/v2_21_0/CDT-svcObjWrapper-v2_21_0.xsd
+++ b/v2_21_0/CDT-svcObjWrapper-v2_21_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v2_21_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-timeSeries-v2_21_0.xsd b/v2_21_0/CDT-timeSeries-v2_21_0.xsd
index 10b13e7..8eb15db 100644
--- a/v2_21_0/CDT-timeSeries-v2_21_0.xsd
+++ b/v2_21_0/CDT-timeSeries-v2_21_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_21_0/CDT-timeSeriesInstance-v2_21_0.xsd b/v2_21_0/CDT-timeSeriesInstance-v2_21_0.xsd
index abcda11..5dc897a 100644
--- a/v2_21_0/CDT-timeSeriesInstance-v2_21_0.xsd
+++ b/v2_21_0/CDT-timeSeriesInstance-v2_21_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-token-v2_21_0.xsd b/v2_21_0/CDT-token-v2_21_0.xsd
index 4839c67..704fc1e 100644
--- a/v2_21_0/CDT-token-v2_21_0.xsd
+++ b/v2_21_0/CDT-token-v2_21_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_21_0/CDT-trafficPattern-v2_21_0.xsd b/v2_21_0/CDT-trafficPattern-v2_21_0.xsd
index e921e01..231dd58 100644
--- a/v2_21_0/CDT-trafficPattern-v2_21_0.xsd
+++ b/v2_21_0/CDT-trafficPattern-v2_21_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab