diff --git a/v2_3_0/CDT-AE-v2_3_0.xsd b/v2_3_0/CDT-AE-v2_3_0.xsd
index 323e6250cbfe95ef0e1311593393d87712903895..a909d4718c2313258c9c613c9864bd1027fb89a7 100644
--- a/v2_3_0/CDT-AE-v2_3_0.xsd
+++ b/v2_3_0/CDT-AE-v2_3_0.xsd
@@ -26,13 +26,13 @@ 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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-CSEBase-v2_3_0.xsd b/v2_3_0/CDT-CSEBase-v2_3_0.xsd
index df2f31f01b4e460e84515369025c6b4d0bd9c25c..3e57d1afc3ba816048d22c4d5b1c4cf2eea0f0be 100644
--- a/v2_3_0/CDT-CSEBase-v2_3_0.xsd
+++ b/v2_3_0/CDT-CSEBase-v2_3_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-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_2_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_3_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_3_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-accessControlPolicy-v2_3_0.xsd b/v2_3_0/CDT-accessControlPolicy-v2_3_0.xsd
index f176ad72f395429dda546704d9829aa76ab83cdb..dffdb7ad6e6d896c30fa9ab32d350e813836ecb8 100644
--- a/v2_3_0/CDT-accessControlPolicy-v2_3_0.xsd
+++ b/v2_3_0/CDT-accessControlPolicy-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-activeCmdhPolicy-v2_3_0.xsd b/v2_3_0/CDT-activeCmdhPolicy-v2_3_0.xsd
index 87b02f0ac20ee5a49a84adf408907cd8fc3ef443..5d27391425f735080a3ccc236c0a08fad0566607 100644
--- a/v2_3_0/CDT-activeCmdhPolicy-v2_3_0.xsd
+++ b/v2_3_0/CDT-activeCmdhPolicy-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-    <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v2_3_0/CDT-areaNwkDeviceInfo-v2_3_0.xsd b/v2_3_0/CDT-areaNwkDeviceInfo-v2_3_0.xsd
index c789174c6d5bfa9b2a2ec2d80deb372bdb8aeff1..0b7f95a505b5b47b528dc3513464faecc30f90bb 100644
--- a/v2_3_0/CDT-areaNwkDeviceInfo-v2_3_0.xsd
+++ b/v2_3_0/CDT-areaNwkDeviceInfo-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-areaNwkInfo-v2_3_0.xsd b/v2_3_0/CDT-areaNwkInfo-v2_3_0.xsd
index c971b9b5a61447a8ad0f57d74244b601f1fc2a2e..2f29169cb4f8be0828f5107fb541b5bf97e90fcc 100644
--- a/v2_3_0/CDT-areaNwkInfo-v2_3_0.xsd
+++ b/v2_3_0/CDT-areaNwkInfo-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-battery-v2_3_0.xsd b/v2_3_0/CDT-battery-v2_3_0.xsd
index 68561756127cabe5a54e4bb6e5e49ff437481e53..7c25e87b7827547d9c4eebe861fe12122d2f6f7f 100644
--- a/v2_3_0/CDT-battery-v2_3_0.xsd
+++ b/v2_3_0/CDT-battery-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-cmdhBuffer-v2_3_0.xsd b/v2_3_0/CDT-cmdhBuffer-v2_3_0.xsd
index bd00176595e03d029424e285790f15c47d9af822..1dbbfc8c0548137a93e77c5fc334ff3d66079ce9 100644
--- a/v2_3_0/CDT-cmdhBuffer-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhBuffer-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v2_3_0/CDT-cmdhDefEcValue-v2_3_0.xsd b/v2_3_0/CDT-cmdhDefEcValue-v2_3_0.xsd
index 1b1a36ee9621b2c1cfe3384fd0e9cf8c7f7b58b2..c17d544b0f8a9f60185d5415ad615de57ef242e6 100644
--- a/v2_3_0/CDT-cmdhDefEcValue-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhDefEcValue-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v2_3_0/CDT-cmdhDefaults-v2_3_0.xsd b/v2_3_0/CDT-cmdhDefaults-v2_3_0.xsd
index 297b84fe6583281b760b7dc8ab60da32dbb921c5..70a4bb8c5f9bd6558c462f31c45582ad44d5ebd4 100644
--- a/v2_3_0/CDT-cmdhDefaults-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhDefaults-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v2_3_0/CDT-cmdhEcDefParamValues-v2_3_0.xsd b/v2_3_0/CDT-cmdhEcDefParamValues-v2_3_0.xsd
index 988d87796e4318a571e671c1deb542fd898469ce..1dfd07c7adc1e08b02db2c1f237c474a6f4edb97 100644
--- a/v2_3_0/CDT-cmdhEcDefParamValues-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhEcDefParamValues-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v2_3_0/CDT-cmdhLimits-v2_3_0.xsd b/v2_3_0/CDT-cmdhLimits-v2_3_0.xsd
index db7f6f2c1e46db9f43c8fd800e717aee25f70f03..35023cd91519a674555d67b31e97ecf2a43e3c27 100644
--- a/v2_3_0/CDT-cmdhLimits-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhLimits-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v2_3_0/CDT-cmdhNetworkAccessRules-v2_3_0.xsd b/v2_3_0/CDT-cmdhNetworkAccessRules-v2_3_0.xsd
index 298c23039d15929b7192d5e869ea0b5a79636a88..63ee950b01ac6d7f2d63d775a346f1d7381a3bbb 100644
--- a/v2_3_0/CDT-cmdhNetworkAccessRules-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhNetworkAccessRules-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v2_3_0/CDT-cmdhNwAccessRule-v2_3_0.xsd b/v2_3_0/CDT-cmdhNwAccessRule-v2_3_0.xsd
index 3c37f117380debd3adbee8494fd43f12780abd28..fd242d794c1a4264b38467526c11f171785dda74 100644
--- a/v2_3_0/CDT-cmdhNwAccessRule-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhNwAccessRule-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v2_3_0/CDT-cmdhPolicy-v2_3_0.xsd b/v2_3_0/CDT-cmdhPolicy-v2_3_0.xsd
index 5d1ea3d26bb003ea040a89918864feebce9e6d40..9e2e6fe7068c889bbae381c0b75c7822400c083f 100644
--- a/v2_3_0/CDT-cmdhPolicy-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhPolicy-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v2_3_0/CDT-commonTypes-v2_3_0.xsd b/v2_3_0/CDT-commonTypes-v2_3_0.xsd
index 308e269dba499918b070bd9e88b994f3ddcae63d..a0d12e4df30a3ac7c87c455b7f6185adb370b517 100644
--- a/v2_3_0/CDT-commonTypes-v2_3_0.xsd
+++ b/v2_3_0/CDT-commonTypes-v2_3_0.xsd
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_3_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_3_0/CDT-container-v2_3_0.xsd b/v2_3_0/CDT-container-v2_3_0.xsd
index a3a5a14fbb40e027eb28627359f5e35f91f1d119..1d8373ffbc8cf7c8798af89ab3c1dee241d5fb91 100644
--- a/v2_3_0/CDT-container-v2_3_0.xsd
+++ b/v2_3_0/CDT-container-v2_3_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-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-contentInstance-v2_3_0.xsd b/v2_3_0/CDT-contentInstance-v2_3_0.xsd
index 68cc4014c1bdc5efbe7bdb4ad85bbfc1f02ab21a..eaf5f630c3942852fa8ad193ddaa1957316585e0 100644
--- a/v2_3_0/CDT-contentInstance-v2_3_0.xsd
+++ b/v2_3_0/CDT-contentInstance-v2_3_0.xsd
@@ -27,7 +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-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-delivery-v2_3_0.xsd b/v2_3_0/CDT-delivery-v2_3_0.xsd
index b8fd0d47116d789ce71c98d15ca513d0ed152cee..ee4ecaf9983690dfed9faeffb65751995b8399ec 100644
--- a/v2_3_0/CDT-delivery-v2_3_0.xsd
+++ b/v2_3_0/CDT-delivery-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v2_3_0/CDT-deviceCapability-v2_3_0.xsd b/v2_3_0/CDT-deviceCapability-v2_3_0.xsd
index 48a5645f7634fbbe8270bb09f3ddbf02ec045909..9f943ae992c419d850cc028d1d9bba9e0ecd089f 100644
--- a/v2_3_0/CDT-deviceCapability-v2_3_0.xsd
+++ b/v2_3_0/CDT-deviceCapability-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-deviceInfo-v2_3_0.xsd b/v2_3_0/CDT-deviceInfo-v2_3_0.xsd
index 3516d9aeacae5c401705aad2f079b71d0d9a6353..08c2c161982a04462023e13ea06659ab2abd8bde 100644
--- a/v2_3_0/CDT-deviceInfo-v2_3_0.xsd
+++ b/v2_3_0/CDT-deviceInfo-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-eventConfig-v2_3_0.xsd b/v2_3_0/CDT-eventConfig-v2_3_0.xsd
index 2db9bdcfe49901af5b63f43ff6320c96e4866a8a..9004af83bb06676e4479ae6c84e84012a9a1a561 100644
--- a/v2_3_0/CDT-eventConfig-v2_3_0.xsd
+++ b/v2_3_0/CDT-eventConfig-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-eventLog-v2_3_0.xsd b/v2_3_0/CDT-eventLog-v2_3_0.xsd
index ec8fe355a9d5f1a6b95eab3acf63e7148f4f72ce..01be4ea705803c3302513e6b03b2451a07381de3 100644
--- a/v2_3_0/CDT-eventLog-v2_3_0.xsd
+++ b/v2_3_0/CDT-eventLog-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-execInstance-v2_3_0.xsd b/v2_3_0/CDT-execInstance-v2_3_0.xsd
index 4fdb38b47d4561fe9928abad24287da586cde3ee..e5827e44194526ec9eacec9ec936849bd8ee3c06 100644
--- a/v2_3_0/CDT-execInstance-v2_3_0.xsd
+++ b/v2_3_0/CDT-execInstance-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-firmware-v2_3_0.xsd b/v2_3_0/CDT-firmware-v2_3_0.xsd
index a13c4c3859a9eefd288f8fa82d4c5995266d95f6..30534aac31fd8d1133727d651626081c76f25861 100644
--- a/v2_3_0/CDT-firmware-v2_3_0.xsd
+++ b/v2_3_0/CDT-firmware-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-group-v2_3_0.xsd b/v2_3_0/CDT-group-v2_3_0.xsd
index c08227f432cf22cf32b6e8147990a7fda4f6ad45..bd851c33d6654bad74617f71f7fe9c275f79911b 100644
--- a/v2_3_0/CDT-group-v2_3_0.xsd
+++ b/v2_3_0/CDT-group-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-locationPolicy-v2_3_0.xsd b/v2_3_0/CDT-locationPolicy-v2_3_0.xsd
index d14f9dca980edc68de1724e2ea9b516ccd76e7f3..036f200ec40cc37f1df2356d1990af8b578a1b23 100644
--- a/v2_3_0/CDT-locationPolicy-v2_3_0.xsd
+++ b/v2_3_0/CDT-locationPolicy-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd b/v2_3_0/CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd
index f04529830928f142e7c7d195371083382a549122..3614701067333b872bba99754c891a81bb8f8c0e 100644
--- a/v2_3_0/CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd
+++ b/v2_3_0/CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_3_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-memory-v2_3_0.xsd b/v2_3_0/CDT-memory-v2_3_0.xsd
index 7997060213a1a099fb26f57bc3f423bdde35823f..3b0d4702873aae7d6803ebf1ec706a963a6d4ffa 100644
--- a/v2_3_0/CDT-memory-v2_3_0.xsd
+++ b/v2_3_0/CDT-memory-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-mgmtCmd-v2_3_0.xsd b/v2_3_0/CDT-mgmtCmd-v2_3_0.xsd
index acac8fdb0e6489a53990896dadc52032e405c1a3..41677dba1e19f7962647ab2e265eaabf62234a11 100644
--- a/v2_3_0/CDT-mgmtCmd-v2_3_0.xsd
+++ b/v2_3_0/CDT-mgmtCmd-v2_3_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_3_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-node-v2_3_0.xsd b/v2_3_0/CDT-node-v2_3_0.xsd
index 1da51e07516391e0bae4a7a6daefcb43641fa521..b1d24ee46e9b97c94adca83076002ebbf745efc1 100644
--- a/v2_3_0/CDT-node-v2_3_0.xsd
+++ b/v2_3_0/CDT-node-v2_3_0.xsd
@@ -27,20 +27,20 @@ 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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-notification-v2_3_0.xsd b/v2_3_0/CDT-notification-v2_3_0.xsd
index bfd0b88dd05c9ee1f5853a553bf01ec13f1d43bf..c74f69620148f52567732592baee2fbf051b28e2 100644
--- a/v2_3_0/CDT-notification-v2_3_0.xsd
+++ b/v2_3_0/CDT-notification-v2_3_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         targetNamespace="http://www.onem2m.org/xml/protocols"
         xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_2_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_3_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_3_0/CDT-pollingChannel-v2_3_0.xsd b/v2_3_0/CDT-pollingChannel-v2_3_0.xsd
index 12ea937199f615400f9f0e61b32d02ac08cae6ca..124547446b36614661fb557adaf1961e1974e32d 100644
--- a/v2_3_0/CDT-pollingChannel-v2_3_0.xsd
+++ b/v2_3_0/CDT-pollingChannel-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-reboot-v2_3_0.xsd b/v2_3_0/CDT-reboot-v2_3_0.xsd
index 8fdb59b53b8d8c5590023493e10ca474e6e1af03..0c5e849b254dfd0d52ec201bbf4931e23db29e97 100644
--- a/v2_3_0/CDT-reboot-v2_3_0.xsd
+++ b/v2_3_0/CDT-reboot-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-remoteCSE-v2_3_0.xsd b/v2_3_0/CDT-remoteCSE-v2_3_0.xsd
index ff0297cefbc2e2ab1d992b416f5a1d433b66bbc0..c456c144d0fc364e6a88b984d2acde7dec9f745a 100644
--- a/v2_3_0/CDT-remoteCSE-v2_3_0.xsd
+++ b/v2_3_0/CDT-remoteCSE-v2_3_0.xsd
@@ -26,15 +26,15 @@ 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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_3_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-request-v2_3_0.xsd b/v2_3_0/CDT-request-v2_3_0.xsd
index 425606a5432f354ada9c4249084c47897d938d1b..3260482aaf37cc2d6452d5d2747c6df0e87d0e82 100644
--- a/v2_3_0/CDT-request-v2_3_0.xsd
+++ b/v2_3_0/CDT-request-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-requestPrimitive-v2_3_0.xsd b/v2_3_0/CDT-requestPrimitive-v2_3_0.xsd
index d17512f79b182083501d0c8a8d4c9d776ee4d49f..c7a0fef8fe0504a7fc9a908945ac41fc2ed324bd 100644
--- a/v2_3_0/CDT-requestPrimitive-v2_3_0.xsd
+++ b/v2_3_0/CDT-requestPrimitive-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_3_0/CDT-responsePrimitive-v2_3_0.xsd b/v2_3_0/CDT-responsePrimitive-v2_3_0.xsd
index 762cd8587055a1c1dd999217e76c44124c29929d..510af0004bfda6a8802fb4647af60e85c0534deb 100644
--- a/v2_3_0/CDT-responsePrimitive-v2_3_0.xsd
+++ b/v2_3_0/CDT-responsePrimitive-v2_3_0.xsd
@@ -28,51 +28,51 @@ 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_2_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_3_0/CDT-schedule-v2_3_0.xsd b/v2_3_0/CDT-schedule-v2_3_0.xsd
index ce3ec17f4a37bb66b1bc63dbe5d3816e91b0bb4a..f3269f4ec30192ad19bf8cdc814abb62da01cbe7 100644
--- a/v2_3_0/CDT-schedule-v2_3_0.xsd
+++ b/v2_3_0/CDT-schedule-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-serviceSubscribedAppRule-v2_3_0.xsd b/v2_3_0/CDT-serviceSubscribedAppRule-v2_3_0.xsd
index cc7519b633c6c936a808652f5e2078db68567efe..aa59c6288d23722a593fd29857a785f1feb8c23c 100644
--- a/v2_3_0/CDT-serviceSubscribedAppRule-v2_3_0.xsd
+++ b/v2_3_0/CDT-serviceSubscribedAppRule-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-serviceSubscribedNode-v2_3_0.xsd b/v2_3_0/CDT-serviceSubscribedNode-v2_3_0.xsd
index 88d0582c9561f00efb56c309aad582c93ea90110..3a69b18ae562880a355adb453c0e581299d9ffa4 100644
--- a/v2_3_0/CDT-serviceSubscribedNode-v2_3_0.xsd
+++ b/v2_3_0/CDT-serviceSubscribedNode-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-software-v2_3_0.xsd b/v2_3_0/CDT-software-v2_3_0.xsd
index 6db4857760cf446b189f9bfdb362ba8c99341fd8..99f3ace44908151928a51cac57571fb247d1e571 100644
--- a/v2_3_0/CDT-software-v2_3_0.xsd
+++ b/v2_3_0/CDT-software-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-statsCollect-v2_3_0.xsd b/v2_3_0/CDT-statsCollect-v2_3_0.xsd
index 01aa7234072bc780bb6fec37b36032ef5386d94a..eeb495402f5c8d61db5d3945ea12bc4ba26c83ca 100644
--- a/v2_3_0/CDT-statsCollect-v2_3_0.xsd
+++ b/v2_3_0/CDT-statsCollect-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-statsConfig-v2_3_0.xsd b/v2_3_0/CDT-statsConfig-v2_3_0.xsd
index a328d043d4e89d9ba278cf5f0ffa745df0f78e21..0b41e32629599f150296936cac61f2494cb7f408 100644
--- a/v2_3_0/CDT-statsConfig-v2_3_0.xsd
+++ b/v2_3_0/CDT-statsConfig-v2_3_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-subscription-v2_3_0.xsd b/v2_3_0/CDT-subscription-v2_3_0.xsd
index 1079e6be827f6fc32b293e4e18d8401266427d7e..e784c1ecbabc3c9ed1b1e5a0980f8a7eb562a01f 100644
--- a/v2_3_0/CDT-subscription-v2_3_0.xsd
+++ b/v2_3_0/CDT-subscription-v2_3_0.xsd
@@ -27,8 +27,8 @@ 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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>