diff --git a/v2_11_0/CDT-AE-v2_11_0.xsd b/v2_11_0/CDT-AE-v2_11_0.xsd
index b79c95e004d957e88df95d28c36eb7ac5adaa773..c94ab0fd5a7c12f75abb406f658ace20f8b32a4e 100644
--- a/v2_11_0/CDT-AE-v2_11_0.xsd
+++ b/v2_11_0/CDT-AE-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_11_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-CSEBase-v2_11_0.xsd b/v2_11_0/CDT-CSEBase-v2_11_0.xsd
index f93179ac26c54ee595c718af6048cc247d1cff5d..ea639f5acb33af8a83c262748f1f18cd8e5d9727 100644
--- a/v2_11_0/CDT-CSEBase-v2_11_0.xsd
+++ b/v2_11_0/CDT-CSEBase-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_10_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_11_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v2_11_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v2_11_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-accessControlPolicy-v2_11_0.xsd b/v2_11_0/CDT-accessControlPolicy-v2_11_0.xsd
index 64b5f4dc6c1e1060ffdfacbe420720ca357b4834..afad18d1846323ee095731ea746231ba5319323d 100644
--- a/v2_11_0/CDT-accessControlPolicy-v2_11_0.xsd
+++ b/v2_11_0/CDT-accessControlPolicy-v2_11_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_10_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-activeCmdhPolicy-v2_11_0.xsd b/v2_11_0/CDT-activeCmdhPolicy-v2_11_0.xsd
index 610a452ecf843d41cb2ac1f49e4d90a5bb4b62bf..e8b3ceaa09209f24c834dd20aa87bf85e8fe2fca 100644
--- a/v2_11_0/CDT-activeCmdhPolicy-v2_11_0.xsd
+++ b/v2_11_0/CDT-activeCmdhPolicy-v2_11_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_10_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_11_0/CDT-allJoynApp-v2_11_0.xsd b/v2_11_0/CDT-allJoynApp-v2_11_0.xsd
index 0476b1acd37289f08db67ea413abfb4ace0b26c6..e082a0100065c349352dab2411da9837b37f614b 100644
--- a/v2_11_0/CDT-allJoynApp-v2_11_0.xsd
+++ b/v2_11_0/CDT-allJoynApp-v2_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_11_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-allJoynInterface-v2_11_0.xsd b/v2_11_0/CDT-allJoynInterface-v2_11_0.xsd
index bec19cff0fd3d7bd489bd845edcf8845870bf6fe..dfae0c50456d4323ce4e31a86d75cae6eb2d516c 100644
--- a/v2_11_0/CDT-allJoynInterface-v2_11_0.xsd
+++ b/v2_11_0/CDT-allJoynInterface-v2_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_11_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_11_0/CDT-allJoynMethod-v2_11_0.xsd b/v2_11_0/CDT-allJoynMethod-v2_11_0.xsd
index cf2b548a5545e5fb7f526978b3a33e91cf8b308b..d98d80c838c48d7929ad4367a9202d0a8e3d1641 100644
--- a/v2_11_0/CDT-allJoynMethod-v2_11_0.xsd
+++ b/v2_11_0/CDT-allJoynMethod-v2_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_11_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_11_0/CDT-allJoynMethodCall-v2_11_0.xsd b/v2_11_0/CDT-allJoynMethodCall-v2_11_0.xsd
index c97d88b7fe2a29d6ca1b8d8f1e75f8ed1fa62104..d79846a5e92090c97234406752a92cc6cbf68db3 100644
--- a/v2_11_0/CDT-allJoynMethodCall-v2_11_0.xsd
+++ b/v2_11_0/CDT-allJoynMethodCall-v2_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-allJoynProperty-v2_11_0.xsd b/v2_11_0/CDT-allJoynProperty-v2_11_0.xsd
index 2d3573b7a04e1dbd6fab2c05f33c149aabc466ca..085ab665239a536866f715ef090e7166b056a92d 100644
--- a/v2_11_0/CDT-allJoynProperty-v2_11_0.xsd
+++ b/v2_11_0/CDT-allJoynProperty-v2_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-allJoynSvcObject-v2_11_0.xsd b/v2_11_0/CDT-allJoynSvcObject-v2_11_0.xsd
index 145a9ff5735602c6c3e523454f60f4265765f3de..1eda7d2705a4c7720200726596b4cd4cbe1180ea 100644
--- a/v2_11_0/CDT-allJoynSvcObject-v2_11_0.xsd
+++ b/v2_11_0/CDT-allJoynSvcObject-v2_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v2_11_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-areaNwkDeviceInfo-v2_11_0.xsd b/v2_11_0/CDT-areaNwkDeviceInfo-v2_11_0.xsd
index 36a47cdac35d6b3f2f34a29e9bd7886d4d8fe01e..479c86d5714fc6f163a19a4b8707dab8c812e10c 100644
--- a/v2_11_0/CDT-areaNwkDeviceInfo-v2_11_0.xsd
+++ b/v2_11_0/CDT-areaNwkDeviceInfo-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-areaNwkInfo-v2_11_0.xsd b/v2_11_0/CDT-areaNwkInfo-v2_11_0.xsd
index f672a158f9d636f15d3511c37e835032606970f1..1c5872a8bb1c9c6d0e83fcaf964bebbe53cf593d 100644
--- a/v2_11_0/CDT-areaNwkInfo-v2_11_0.xsd
+++ b/v2_11_0/CDT-areaNwkInfo-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-battery-v2_11_0.xsd b/v2_11_0/CDT-battery-v2_11_0.xsd
index 62abc25fb2970ab7a5b725ca906d46e39af6d25b..fd97498ceaccac6aa28f9da7eb07efffecfa8714 100644
--- a/v2_11_0/CDT-battery-v2_11_0.xsd
+++ b/v2_11_0/CDT-battery-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-cmdhBuffer-v2_11_0.xsd b/v2_11_0/CDT-cmdhBuffer-v2_11_0.xsd
index 901b3d1755e84c378824c7795c46811b18a80c8f..085d09a8a21f1b07f13ed323ed50d888808a1045 100644
--- a/v2_11_0/CDT-cmdhBuffer-v2_11_0.xsd
+++ b/v2_11_0/CDT-cmdhBuffer-v2_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_11_0/CDT-cmdhDefEcValue-v2_11_0.xsd b/v2_11_0/CDT-cmdhDefEcValue-v2_11_0.xsd
index aa6ba591eb46e0b201cb9bdf6fb3286f2cf56dbd..8e2a1df24d3d8c917bff86bb3ced85f51b51b317 100644
--- a/v2_11_0/CDT-cmdhDefEcValue-v2_11_0.xsd
+++ b/v2_11_0/CDT-cmdhDefEcValue-v2_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_11_0/CDT-cmdhDefaults-v2_11_0.xsd b/v2_11_0/CDT-cmdhDefaults-v2_11_0.xsd
index 402bd81d2b43bdec029fd101d2e1c5f608657cfd..ea8cb74aae2571a72a82b73ad8b6efed4f458502 100644
--- a/v2_11_0/CDT-cmdhDefaults-v2_11_0.xsd
+++ b/v2_11_0/CDT-cmdhDefaults-v2_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_11_0/CDT-cmdhEcDefParamValues-v2_11_0.xsd b/v2_11_0/CDT-cmdhEcDefParamValues-v2_11_0.xsd
index ab108a6d37a1f39f0b36cf1f1943712dcc615aa7..d3ebdc229571afdc394f1c88ff045b509f65ca79 100644
--- a/v2_11_0/CDT-cmdhEcDefParamValues-v2_11_0.xsd
+++ b/v2_11_0/CDT-cmdhEcDefParamValues-v2_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_11_0/CDT-cmdhLimits-v2_11_0.xsd b/v2_11_0/CDT-cmdhLimits-v2_11_0.xsd
index 69d47c509e51811520b54cd2fa52f5aedc2acf16..f7ba74926d1fbde34ab595e589b50577f62b474e 100644
--- a/v2_11_0/CDT-cmdhLimits-v2_11_0.xsd
+++ b/v2_11_0/CDT-cmdhLimits-v2_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_11_0/CDT-cmdhNetworkAccessRules-v2_11_0.xsd b/v2_11_0/CDT-cmdhNetworkAccessRules-v2_11_0.xsd
index b48f4683b40e555eb61efe99c004181b9606e19d..77396fc3f7e4f810a87b5c8927da8835d4c1a3f1 100644
--- a/v2_11_0/CDT-cmdhNetworkAccessRules-v2_11_0.xsd
+++ b/v2_11_0/CDT-cmdhNetworkAccessRules-v2_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_11_0/CDT-cmdhNwAccessRule-v2_11_0.xsd b/v2_11_0/CDT-cmdhNwAccessRule-v2_11_0.xsd
index 597491eefb89534347b72adfcb8af77209b028df..ac9e4c0805388e6fd9cd9619fa24a1bcefe0500b 100644
--- a/v2_11_0/CDT-cmdhNwAccessRule-v2_11_0.xsd
+++ b/v2_11_0/CDT-cmdhNwAccessRule-v2_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_11_0/CDT-cmdhPolicy-v2_11_0.xsd b/v2_11_0/CDT-cmdhPolicy-v2_11_0.xsd
index 102ef1a62655febb47c5492ed74e676c788d3e68..5a52d677e609855d927805c706e62d49052621c1 100644
--- a/v2_11_0/CDT-cmdhPolicy-v2_11_0.xsd
+++ b/v2_11_0/CDT-cmdhPolicy-v2_11_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_10_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_11_0/CDT-commonTypes-v2_11_0.xsd b/v2_11_0/CDT-commonTypes-v2_11_0.xsd
index e703809bbe9e7df594373b8479392fd6d5b034af..513af16b225ada6a03c0f7803cf4edd449edf89e 100644
--- a/v2_11_0/CDT-commonTypes-v2_11_0.xsd
+++ b/v2_11_0/CDT-commonTypes-v2_11_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_11_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_11_0/CDT-container-v2_11_0.xsd b/v2_11_0/CDT-container-v2_11_0.xsd
index dc040aa80e1099d605e896705b8a25581cdca0fa..8e92ab55958b3bd94af13e170445c5291087f766 100644
--- a/v2_11_0/CDT-container-v2_11_0.xsd
+++ b/v2_11_0/CDT-container-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_11_0/CDT-contentInstance-v2_11_0.xsd b/v2_11_0/CDT-contentInstance-v2_11_0.xsd
index b521a67fd0d2618e6d9e613171559b0c3bcf3909..04d1733776530e80e92196c0a457c5973f4117cb 100644
--- a/v2_11_0/CDT-contentInstance-v2_11_0.xsd
+++ b/v2_11_0/CDT-contentInstance-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-delivery-v2_11_0.xsd b/v2_11_0/CDT-delivery-v2_11_0.xsd
index d18f9dda2e56d6c7929ad5ddbe0561b89fb62b36..0a513db724ef8273a8f600d990343f7029fd4e48 100644
--- a/v2_11_0/CDT-delivery-v2_11_0.xsd
+++ b/v2_11_0/CDT-delivery-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_11_0/CDT-deviceCapability-v2_11_0.xsd b/v2_11_0/CDT-deviceCapability-v2_11_0.xsd
index 449a79657654e2acfe7ba3bd80dda108fec6262b..756fd2d0addd4cdae96fcda023899b6987aad86b 100644
--- a/v2_11_0/CDT-deviceCapability-v2_11_0.xsd
+++ b/v2_11_0/CDT-deviceCapability-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-deviceInfo-v2_11_0.xsd b/v2_11_0/CDT-deviceInfo-v2_11_0.xsd
index d54c300ff3d5a826f6f162b9f04ed6cafa206b75..33953c46cf72945fd9c179eeda5e1c7b02d92251 100644
--- a/v2_11_0/CDT-deviceInfo-v2_11_0.xsd
+++ b/v2_11_0/CDT-deviceInfo-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-dynamicAuthorizationConsultation-v2_11_0.xsd b/v2_11_0/CDT-dynamicAuthorizationConsultation-v2_11_0.xsd
index 98d5b2e4245661e4e963b586c5ec220b13cdbff2..7fab76e32c3cf71e52a2844946e1a0d9d8b9aff5 100644
--- a/v2_11_0/CDT-dynamicAuthorizationConsultation-v2_11_0.xsd
+++ b/v2_11_0/CDT-dynamicAuthorizationConsultation-v2_11_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-eventConfig-v2_11_0.xsd b/v2_11_0/CDT-eventConfig-v2_11_0.xsd
index 1ad1990faebeeb75a51e5360f07dc5ee193f6526..3761a8e871aa0db9b0804c1894dd12b56b8c6180 100644
--- a/v2_11_0/CDT-eventConfig-v2_11_0.xsd
+++ b/v2_11_0/CDT-eventConfig-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-eventLog-v2_11_0.xsd b/v2_11_0/CDT-eventLog-v2_11_0.xsd
index 2b158dc3983f1d63fa26d038113c5d8ce79b8e2f..a07ff2d4efcdf11b11dddc0f77762dfc4add308e 100644
--- a/v2_11_0/CDT-eventLog-v2_11_0.xsd
+++ b/v2_11_0/CDT-eventLog-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-execInstance-v2_11_0.xsd b/v2_11_0/CDT-execInstance-v2_11_0.xsd
index 364fa3b0a9808d2a8dcadd7c1a720cea246847cb..992630fa00723eb82d6087eaad9ec8ee8b24fdb7 100644
--- a/v2_11_0/CDT-execInstance-v2_11_0.xsd
+++ b/v2_11_0/CDT-execInstance-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-firmware-v2_11_0.xsd b/v2_11_0/CDT-firmware-v2_11_0.xsd
index e319dcffec4b07f42ded28b87f470efab555e601..84fcdd77fd19cce0d2f607defcd7260d8e0b9385 100644
--- a/v2_11_0/CDT-firmware-v2_11_0.xsd
+++ b/v2_11_0/CDT-firmware-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-genericInterworkingOperationInstance-v2_11_0.xsd b/v2_11_0/CDT-genericInterworkingOperationInstance-v2_11_0.xsd
index 8bd47e0e314bd647396f8dd0ebb75570182d9a94..9e07feb1f65ccde3c3cd3d4e0f6dbad09798e379 100644
--- a/v2_11_0/CDT-genericInterworkingOperationInstance-v2_11_0.xsd
+++ b/v2_11_0/CDT-genericInterworkingOperationInstance-v2_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-genericInterworkingService-v2_11_0.xsd b/v2_11_0/CDT-genericInterworkingService-v2_11_0.xsd
index 8609599b3b7b269bc252ad9415d77458bb27cd89..f19ff222510befdddb364ed4eb45a1e18bfddea1 100644
--- a/v2_11_0/CDT-genericInterworkingService-v2_11_0.xsd
+++ b/v2_11_0/CDT-genericInterworkingService-v2_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_11_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-group-v2_11_0.xsd b/v2_11_0/CDT-group-v2_11_0.xsd
index c4439df2b7a6efe4c23c42d30801d3d5af85a931..5d4c71e237cd0c5b4eb9b7218d05ba19c4dff09a 100644
--- a/v2_11_0/CDT-group-v2_11_0.xsd
+++ b/v2_11_0/CDT-group-v2_11_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-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-locationPolicy-v2_11_0.xsd b/v2_11_0/CDT-locationPolicy-v2_11_0.xsd
index 035443c5d2055da50fba4334e4d49b9ec298f9a6..4d7107fbae5e60c9848384bd62dd6064be30cb32 100644
--- a/v2_11_0/CDT-locationPolicy-v2_11_0.xsd
+++ b/v2_11_0/CDT-locationPolicy-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-m2mServiceSubscriptionProfile-v2_11_0.xsd b/v2_11_0/CDT-m2mServiceSubscriptionProfile-v2_11_0.xsd
index aba43fee5962d9464174d73c14a1276159c3cff3..d5744e1f18568072318960fc86f92b590f4882b5 100644
--- a/v2_11_0/CDT-m2mServiceSubscriptionProfile-v2_11_0.xsd
+++ b/v2_11_0/CDT-m2mServiceSubscriptionProfile-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_11_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-memory-v2_11_0.xsd b/v2_11_0/CDT-memory-v2_11_0.xsd
index 21fecf669205393970cc9b91cac453e12b110e93..0d628d17d8deded9cb3f45019af3e471bf32fd5f 100644
--- a/v2_11_0/CDT-memory-v2_11_0.xsd
+++ b/v2_11_0/CDT-memory-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-mgmtCmd-v2_11_0.xsd b/v2_11_0/CDT-mgmtCmd-v2_11_0.xsd
index 61baaef251aec3c299fe46cca263e62c1aac6498..2fc6c78c3dc4cbcbc70e2748f8ec842160a41e97 100644
--- a/v2_11_0/CDT-mgmtCmd-v2_11_0.xsd
+++ b/v2_11_0/CDT-mgmtCmd-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_11_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-node-v2_11_0.xsd b/v2_11_0/CDT-node-v2_11_0.xsd
index dc3058bff05bec32df141ed6fc8c710e0e9020bf..2a2582022460d6998c6c5685b135f097125623e9 100644
--- a/v2_11_0/CDT-node-v2_11_0.xsd
+++ b/v2_11_0/CDT-node-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_11_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-notification-v2_11_0.xsd b/v2_11_0/CDT-notification-v2_11_0.xsd
index 048bd8d9f957cbbdb89b2db63e25391212735cee..47a67b2567f03f0dd9fc2ef4c0394cb2843374c5 100644
--- a/v2_11_0/CDT-notification-v2_11_0.xsd
+++ b/v2_11_0/CDT-notification-v2_11_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_10_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_10_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_11_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_11_0/CDT-notificationTargetMgmtPolicyRef-v2_11_0.xsd b/v2_11_0/CDT-notificationTargetMgmtPolicyRef-v2_11_0.xsd
index 1ff52d8c93f929c46c4752175ff0a94907863cf0..e5dbc0935da43672b443733223464ca361598c44 100644
--- a/v2_11_0/CDT-notificationTargetMgmtPolicyRef-v2_11_0.xsd
+++ b/v2_11_0/CDT-notificationTargetMgmtPolicyRef-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-notificationTargetPolicy-v2_11_0.xsd b/v2_11_0/CDT-notificationTargetPolicy-v2_11_0.xsd
index 06fee4e9dd9c6aad83e55bdf7a0d2bde4cc3f1ef..87e2874b6ce15e40f83b0ef9b089c3efc87fa77c 100644
--- a/v2_11_0/CDT-notificationTargetPolicy-v2_11_0.xsd
+++ b/v2_11_0/CDT-notificationTargetPolicy-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-policyDeletionRules-v2_11_0.xsd b/v2_11_0/CDT-policyDeletionRules-v2_11_0.xsd
index 5562acaed0d47629324da64131f2f36dcb14ebac..666887391c0bf78843f9b871b7a1a480d5207005 100644
--- a/v2_11_0/CDT-policyDeletionRules-v2_11_0.xsd
+++ b/v2_11_0/CDT-policyDeletionRules-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-pollingChannel-v2_11_0.xsd b/v2_11_0/CDT-pollingChannel-v2_11_0.xsd
index 6f6eb65d0f1a057844ae90e7914350ac6fc1e750..acc6449de7d915c12e9b426834b16ff58a37acd7 100644
--- a/v2_11_0/CDT-pollingChannel-v2_11_0.xsd
+++ b/v2_11_0/CDT-pollingChannel-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-reboot-v2_11_0.xsd b/v2_11_0/CDT-reboot-v2_11_0.xsd
index 5d88191231e749b505ce455212a7c18dee21daee..1725de0e05d8c9fe93b904a3cfab4de47b1f127d 100644
--- a/v2_11_0/CDT-reboot-v2_11_0.xsd
+++ b/v2_11_0/CDT-reboot-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-remoteCSE-v2_11_0.xsd b/v2_11_0/CDT-remoteCSE-v2_11_0.xsd
index 480597dfe311053688ba4cee2d2467f893e2fd04..743664b733476999f56c2079b632178e3cb55d85 100644
--- a/v2_11_0/CDT-remoteCSE-v2_11_0.xsd
+++ b/v2_11_0/CDT-remoteCSE-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_11_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-request-v2_11_0.xsd b/v2_11_0/CDT-request-v2_11_0.xsd
index 2b0f99879776bd4c8c0c109ebf5f15b82417b23d..3da67e401b37f3b7bfb1207711b2dbe206e88029 100644
--- a/v2_11_0/CDT-request-v2_11_0.xsd
+++ b/v2_11_0/CDT-request-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-requestPrimitive-v2_11_0.xsd b/v2_11_0/CDT-requestPrimitive-v2_11_0.xsd
index 119f0f89d366c980eb226ee1fbdd35a14acd32fa..64b93ad1d74ee7789ca67551a3ae3d35f80f6b72 100644
--- a/v2_11_0/CDT-requestPrimitive-v2_11_0.xsd
+++ b/v2_11_0/CDT-requestPrimitive-v2_11_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_10_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_11_0/CDT-responsePrimitive-v2_11_0.xsd b/v2_11_0/CDT-responsePrimitive-v2_11_0.xsd
index 464e07c4f24edc7649aedaf6288377bef57e660e..7b9b33a33a7131b384119719267d51535c4bdf6d 100644
--- a/v2_11_0/CDT-responsePrimitive-v2_11_0.xsd
+++ b/v2_11_0/CDT-responsePrimitive-v2_11_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_10_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_10_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_11_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_11_0/CDT-role-v2_11_0.xsd b/v2_11_0/CDT-role-v2_11_0.xsd
index aff89ad2aa1b987a997af0ffe8dd037a08e2aac2..db6924a5b0275dab2783d69e538a10657487ed93 100644
--- a/v2_11_0/CDT-role-v2_11_0.xsd
+++ b/v2_11_0/CDT-role-v2_11_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-schedule-v2_11_0.xsd b/v2_11_0/CDT-schedule-v2_11_0.xsd
index 7e8156be1c20358a83ef40741a39be162fc17160..283e5d6d8dc58ae24513de701795216f2419783d 100644
--- a/v2_11_0/CDT-schedule-v2_11_0.xsd
+++ b/v2_11_0/CDT-schedule-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-semanticDescriptor-v2_11_0.xsd b/v2_11_0/CDT-semanticDescriptor-v2_11_0.xsd
index 6dedc8378d97d9631a297ac527da2d8eed94d6d7..53befe75f73dd1a3549623fc25ce845f1e1d994e 100644
--- a/v2_11_0/CDT-semanticDescriptor-v2_11_0.xsd
+++ b/v2_11_0/CDT-semanticDescriptor-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-serviceSubscribedAppRule-v2_11_0.xsd b/v2_11_0/CDT-serviceSubscribedAppRule-v2_11_0.xsd
index 568c458357f71e04b056eaecaeda39da069033cd..b3ab9e71491eca2588540392def5714a3678a5ed 100644
--- a/v2_11_0/CDT-serviceSubscribedAppRule-v2_11_0.xsd
+++ b/v2_11_0/CDT-serviceSubscribedAppRule-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-serviceSubscribedNode-v2_11_0.xsd b/v2_11_0/CDT-serviceSubscribedNode-v2_11_0.xsd
index 8e08894023c732142e7223a695e570e74eb0fd62..77b056012783d6509695c53ca54fba10839ac10f 100644
--- a/v2_11_0/CDT-serviceSubscribedNode-v2_11_0.xsd
+++ b/v2_11_0/CDT-serviceSubscribedNode-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-software-v2_11_0.xsd b/v2_11_0/CDT-software-v2_11_0.xsd
index 1be2e304186dab1b559c4678f4c7457c7f6ee875..498c3deec46cfdb11ab526e2b776b1f0f63a9812 100644
--- a/v2_11_0/CDT-software-v2_11_0.xsd
+++ b/v2_11_0/CDT-software-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-statsCollect-v2_11_0.xsd b/v2_11_0/CDT-statsCollect-v2_11_0.xsd
index 6e2f649062d2e42be5fc8b1eb51562380338d4ec..47e695b3a5f917a801b2e6cdb75a94c5a882b921 100644
--- a/v2_11_0/CDT-statsCollect-v2_11_0.xsd
+++ b/v2_11_0/CDT-statsCollect-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-statsConfig-v2_11_0.xsd b/v2_11_0/CDT-statsConfig-v2_11_0.xsd
index 89c59deb2422cb2e330883c7449b27e9c5172991..1553d8a58261ef80b7261ea8b3363e199f9f4cda 100644
--- a/v2_11_0/CDT-statsConfig-v2_11_0.xsd
+++ b/v2_11_0/CDT-statsConfig-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-subscription-v2_11_0.xsd b/v2_11_0/CDT-subscription-v2_11_0.xsd
index 683fdfb552aaadc1bf5efdc021e520ee2efad8d2..44d957223a19dbdfcc380a457be0af47602c4fe3 100644
--- a/v2_11_0/CDT-subscription-v2_11_0.xsd
+++ b/v2_11_0/CDT-subscription-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_11_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-svcFwWrapper-v2_11_0.xsd b/v2_11_0/CDT-svcFwWrapper-v2_11_0.xsd
index 242bd367c04cbedbdad0a639ba764c80db4a63c7..85dc0c246611d7ca42001e1ba8dfc5904129a6ec 100644
--- a/v2_11_0/CDT-svcFwWrapper-v2_11_0.xsd
+++ b/v2_11_0/CDT-svcFwWrapper-v2_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-svcObjWrapper-v2_11_0.xsd b/v2_11_0/CDT-svcObjWrapper-v2_11_0.xsd
index e99835090b3357cede7e1059808ab2763bd249c4..dc39e8ad9cf5941514559be3c7fd65a02c5b8cbf 100644
--- a/v2_11_0/CDT-svcObjWrapper-v2_11_0.xsd
+++ b/v2_11_0/CDT-svcObjWrapper-v2_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v2_11_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-timeSeries-v2_11_0.xsd b/v2_11_0/CDT-timeSeries-v2_11_0.xsd
index db997f6e43d73f9793efac52a74b9c37c7901d7b..31bea924579831fb9aa82c93c4ebe98225313416 100644
--- a/v2_11_0/CDT-timeSeries-v2_11_0.xsd
+++ b/v2_11_0/CDT-timeSeries-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_11_0/CDT-timeSeriesInstance-v2_11_0.xsd b/v2_11_0/CDT-timeSeriesInstance-v2_11_0.xsd
index 8081f5fa29fb69d09551ab0d1510212230559e26..aad857376da72291b81c3c14a507214783e679f6 100644
--- a/v2_11_0/CDT-timeSeriesInstance-v2_11_0.xsd
+++ b/v2_11_0/CDT-timeSeriesInstance-v2_11_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-token-v2_11_0.xsd b/v2_11_0/CDT-token-v2_11_0.xsd
index 44fa13fff6545ab7e9ec491ae9ae5c7b53bef9cd..383952134066bb785b99a8aa0087de363efd61e9 100644
--- a/v2_11_0/CDT-token-v2_11_0.xsd
+++ b/v2_11_0/CDT-token-v2_11_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_11_0/CDT-trafficPattern-v2_11_0.xsd b/v2_11_0/CDT-trafficPattern-v2_11_0.xsd
index 408b97786e3b250f47142ba142a1d81065c1dcb0..4b07fd96c33da9bdebef974cd48a15543bace37f 100644
--- a/v2_11_0/CDT-trafficPattern-v2_11_0.xsd
+++ b/v2_11_0/CDT-trafficPattern-v2_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_11_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>