diff --git a/v1_1_0/CDT-AE-v1_1_0.xsd b/v1_1_0/CDT-AE-v1_1_0.xsd
index 6ea8a96ca45799070ec675e6077aa08b414398a7..ed57d08e2823d571405a36d863bfe42135b1c2a1 100644
--- a/v1_1_0/CDT-AE-v1_1_0.xsd
+++ b/v1_1_0/CDT-AE-v1_1_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-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_1_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-CSEBase-v1_1_0.xsd b/v1_1_0/CDT-CSEBase-v1_1_0.xsd
index 57dd306d2708d5cd5641518e5fc757d2a02c5008..71286d6d81e7e4d16defe9de32d42600b8b2336c 100644
--- a/v1_1_0/CDT-CSEBase-v1_1_0.xsd
+++ b/v1_1_0/CDT-CSEBase-v1_1_0.xsd
@@ -26,23 +26,23 @@ 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-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v1_0_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_1_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_1_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-activeCmdhPolicy-v1_1_0.xsd b/v1_1_0/CDT-activeCmdhPolicy-v1_1_0.xsd
index a1a86e438cb99aa4fdf9c4d145914e52e9afade7..2498167aefeb7695c2c8c3769e4702bd70488e13 100644
--- a/v1_1_0/CDT-activeCmdhPolicy-v1_1_0.xsd
+++ b/v1_1_0/CDT-activeCmdhPolicy-v1_1_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-v1_0_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_1_0/CDT-areaNwkDeviceInfo-v1_1_0.xsd b/v1_1_0/CDT-areaNwkDeviceInfo-v1_1_0.xsd
index 8588d3746d270ad8de39160715e754f6136138c2..7aace37970c78c5d779364839bc26885e936312a 100644
--- a/v1_1_0/CDT-areaNwkDeviceInfo-v1_1_0.xsd
+++ b/v1_1_0/CDT-areaNwkDeviceInfo-v1_1_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-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-areaNwkInfo-v1_1_0.xsd b/v1_1_0/CDT-areaNwkInfo-v1_1_0.xsd
index 4026302b51a08020435b62caf20550a560d79c79..24b6219f405d8eb158c1b8317a8602cb9102406b 100644
--- a/v1_1_0/CDT-areaNwkInfo-v1_1_0.xsd
+++ b/v1_1_0/CDT-areaNwkInfo-v1_1_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-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-battery-v1_1_0.xsd b/v1_1_0/CDT-battery-v1_1_0.xsd
index 811c31ace0636885b41ee96b1ff8a65c89f7a719..b99d174a66c360f0435e32c849389cb19413ce6f 100644
--- a/v1_1_0/CDT-battery-v1_1_0.xsd
+++ b/v1_1_0/CDT-battery-v1_1_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-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-cmdhBuffer-v1_1_0.xsd b/v1_1_0/CDT-cmdhBuffer-v1_1_0.xsd
index e8dca6e5b56f55ede93f61b2eb62a316ce8a3ada..5addd21c81ce7077fe07711a8cae9020e393958b 100644
--- a/v1_1_0/CDT-cmdhBuffer-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhBuffer-v1_1_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-v1_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_1_0/CDT-cmdhDefEcValue-v1_1_0.xsd b/v1_1_0/CDT-cmdhDefEcValue-v1_1_0.xsd
index ff3316f129c5ea3d76895a198278f994adb90dc1..8181b5f1bfc47681b03e8337407b051ce93d0e84 100644
--- a/v1_1_0/CDT-cmdhDefEcValue-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhDefEcValue-v1_1_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-v1_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_1_0/CDT-cmdhDefaults-v1_1_0.xsd b/v1_1_0/CDT-cmdhDefaults-v1_1_0.xsd
index d33728cfb1cf3a29ca94c1849fdfcdc25b8bc551..896521e57592fdf49189a6815312d832a2821cab 100644
--- a/v1_1_0/CDT-cmdhDefaults-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhDefaults-v1_1_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-v1_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_1_0/CDT-cmdhEcDefParamValues-v1_1_0.xsd b/v1_1_0/CDT-cmdhEcDefParamValues-v1_1_0.xsd
index 0ff274676354e473f178027b28d14fad3ef4dabe..595c7a68bf0ef53158ecf6ac03e3bb37e2abadf6 100644
--- a/v1_1_0/CDT-cmdhEcDefParamValues-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhEcDefParamValues-v1_1_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-v1_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_1_0/CDT-cmdhLimits-v1_1_0.xsd b/v1_1_0/CDT-cmdhLimits-v1_1_0.xsd
index 24c9b48c6e5599938d030156e33649d991b13079..379919072dd704bf49a84c790c91e26a0de9d729 100644
--- a/v1_1_0/CDT-cmdhLimits-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhLimits-v1_1_0.xsd
@@ -28,8 +28,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" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-  <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
@@ -41,17 +41,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <!-- mgmtObj specialization-specific Attributes -->
             <xs:element name="order" type="xs:positiveInteger" />
             <xs:element name="requestOrigin" type="m2m:listOfM2MID" />
-            <!-- TODO In TS-0004 requestContext is shown as xs:string rather than xs:anyType -->
             <xs:element name="requestContext" type="xs:anyType" />
             <xs:element name="requestContextNotification" type="xs:boolean"  minOccurs="0" />
-            <!-- TODO In TS-0004 requestCharacteristics is shown as xs:string rather than xs:anyType -->
             <xs:element name="requestCharacteristics" type="xs:anyType"  />
             <xs:element name="limitsEventCategory" type="m2m:listOfEventCat" />
             <xs:element name="limitsRequestExpTime" type="m2m:listOfMinMax" />
             <xs:element name="limitsResultExpTime" type="m2m:listOfMinMax" />
             <xs:element name="limitsOpExecTime" type="m2m:listOfMinMax" />
             <xs:element name="limitsRespPersistence" type="m2m:listOfMinMax" />
-            <!-- TODO: TS-0004 D.12.5 uses type "m2m:permittedBooleanValues" -->
             <xs:element name="limitsDelAggregation" >
                 <xs:simpleType>
                     <xs:restriction base="xs:token">
diff --git a/v1_1_0/CDT-cmdhNetworkAccessRules-v1_1_0.xsd b/v1_1_0/CDT-cmdhNetworkAccessRules-v1_1_0.xsd
index 5bd8e845978432b3978620b9a17eed7277f84bd8..f94e81ebddfe8ee5d5f26de9e8a194c877fec466 100644
--- a/v1_1_0/CDT-cmdhNetworkAccessRules-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhNetworkAccessRules-v1_1_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-v1_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_1_0/CDT-cmdhNwAccessRule-v1_1_0.xsd b/v1_1_0/CDT-cmdhNwAccessRule-v1_1_0.xsd
index 1a2079db5e530bea2d0f9d9e32367bf35d8cc4d6..e8986a155ed19479d70e5170adc77ad805ec5c13 100644
--- a/v1_1_0/CDT-cmdhNwAccessRule-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhNwAccessRule-v1_1_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-v1_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_1_0/CDT-cmdhPolicy-v1_1_0.xsd b/v1_1_0/CDT-cmdhPolicy-v1_1_0.xsd
index 44d46ab504452552e8d6c62253621b8b52fb6706..2f86969d3964214e29d9a68fdc501c7d69d38ea6 100644
--- a/v1_1_0/CDT-cmdhPolicy-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhPolicy-v1_1_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-v1_0_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_1_0/CDT-container-v1_1_0.xsd b/v1_1_0/CDT-container-v1_1_0.xsd
index 1732e7c3c628feba41ac9fe99168823ba760663e..31d46c6432c0616764d82fbba138af84eb518781 100644
--- a/v1_1_0/CDT-container-v1_1_0.xsd
+++ b/v1_1_0/CDT-container-v1_1_0.xsd
@@ -26,9 +26,9 @@ 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-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-contentInstance-v1_1_0.xsd b/v1_1_0/CDT-contentInstance-v1_1_0.xsd
index a57f8f5b3520fbcee3bc1915c32c9855b0c23c0a..6d89077457c5122f7c30c6e175dafc35336567bd 100644
--- a/v1_1_0/CDT-contentInstance-v1_1_0.xsd
+++ b/v1_1_0/CDT-contentInstance-v1_1_0.xsd
@@ -27,9 +27,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-v1_0_0.xsd" />
-
-
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-delivery-v1_1_0.xsd b/v1_1_0/CDT-delivery-v1_1_0.xsd
index ef65a6e195e7a518b5dbb7c431e6ce5243edcee8..b5abe4af8c432c5723da4589f33e361d9e6c81b7 100644
--- a/v1_1_0/CDT-delivery-v1_1_0.xsd
+++ b/v1_1_0/CDT-delivery-v1_1_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-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v1_1_0/CDT-deviceCapability-v1_1_0.xsd b/v1_1_0/CDT-deviceCapability-v1_1_0.xsd
index 0d8d32576430873cc51d4d3a6f223664b5340096..bd7f5c4b9a77f3619b6e6e0c427baa1abc2f090c 100644
--- a/v1_1_0/CDT-deviceCapability-v1_1_0.xsd
+++ b/v1_1_0/CDT-deviceCapability-v1_1_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-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-deviceInfo-v1_1_0.xsd b/v1_1_0/CDT-deviceInfo-v1_1_0.xsd
index 1f174a49b4c51620b06642aa9908110c5f03aa66..f93b78a870429547291e32c9e4eec4c96f1f31a5 100644
--- a/v1_1_0/CDT-deviceInfo-v1_1_0.xsd
+++ b/v1_1_0/CDT-deviceInfo-v1_1_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-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-eventConfig-v1_1_0.xsd b/v1_1_0/CDT-eventConfig-v1_1_0.xsd
index 3a9abd4f99d43153e0e29c04d4856c8f4a62d5f9..9cc783497597516e969b399b57c0103cce273383 100644
--- a/v1_1_0/CDT-eventConfig-v1_1_0.xsd
+++ b/v1_1_0/CDT-eventConfig-v1_1_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-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>