From b32cae7aa70d9267bb23f68a6e63daa0bf1397ba Mon Sep 17 00:00:00 2001
From: Peter Niblett <peter_niblett@uk.ibm.com>
Date: Mon, 9 May 2022 10:53:02 +0100
Subject: [PATCH] Change include statements to reference 2_30_0

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

diff --git a/v2_30_0/CDT-AE-v2_30_0.xsd b/v2_30_0/CDT-AE-v2_30_0.xsd
index 9ed6cf0..4fa834a 100644
--- a/v2_30_0/CDT-AE-v2_30_0.xsd
+++ b/v2_30_0/CDT-AE-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_30_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-CSEBase-v2_30_0.xsd b/v2_30_0/CDT-CSEBase-v2_30_0.xsd
index 69e0f90..8166785 100644
--- a/v2_30_0/CDT-CSEBase-v2_30_0.xsd
+++ b/v2_30_0/CDT-CSEBase-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_29_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_29_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_30_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v2_30_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v2_30_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-accessControlPolicy-v2_30_0.xsd b/v2_30_0/CDT-accessControlPolicy-v2_30_0.xsd
index 63062d5..0cf5c83 100644
--- a/v2_30_0/CDT-accessControlPolicy-v2_30_0.xsd
+++ b/v2_30_0/CDT-accessControlPolicy-v2_30_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_29_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-activeCmdhPolicy-v2_30_0.xsd b/v2_30_0/CDT-activeCmdhPolicy-v2_30_0.xsd
index dd6aa66..b872381 100644
--- a/v2_30_0/CDT-activeCmdhPolicy-v2_30_0.xsd
+++ b/v2_30_0/CDT-activeCmdhPolicy-v2_30_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_29_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_30_0/CDT-allJoynApp-v2_30_0.xsd b/v2_30_0/CDT-allJoynApp-v2_30_0.xsd
index 4c2e838..45a2f62 100644
--- a/v2_30_0/CDT-allJoynApp-v2_30_0.xsd
+++ b/v2_30_0/CDT-allJoynApp-v2_30_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_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_30_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-allJoynInterface-v2_30_0.xsd b/v2_30_0/CDT-allJoynInterface-v2_30_0.xsd
index 6262469..6aa8f64 100644
--- a/v2_30_0/CDT-allJoynInterface-v2_30_0.xsd
+++ b/v2_30_0/CDT-allJoynInterface-v2_30_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_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_30_0/CDT-allJoynMethod-v2_30_0.xsd b/v2_30_0/CDT-allJoynMethod-v2_30_0.xsd
index 6a7be4b..0d50c39 100644
--- a/v2_30_0/CDT-allJoynMethod-v2_30_0.xsd
+++ b/v2_30_0/CDT-allJoynMethod-v2_30_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_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_30_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_30_0/CDT-allJoynMethodCall-v2_30_0.xsd b/v2_30_0/CDT-allJoynMethodCall-v2_30_0.xsd
index 8207de0..a708c0e 100644
--- a/v2_30_0/CDT-allJoynMethodCall-v2_30_0.xsd
+++ b/v2_30_0/CDT-allJoynMethodCall-v2_30_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_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-allJoynProperty-v2_30_0.xsd b/v2_30_0/CDT-allJoynProperty-v2_30_0.xsd
index b739beb..c553286 100644
--- a/v2_30_0/CDT-allJoynProperty-v2_30_0.xsd
+++ b/v2_30_0/CDT-allJoynProperty-v2_30_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_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-allJoynSvcObject-v2_30_0.xsd b/v2_30_0/CDT-allJoynSvcObject-v2_30_0.xsd
index bbb1f1e..0b003c0 100644
--- a/v2_30_0/CDT-allJoynSvcObject-v2_30_0.xsd
+++ b/v2_30_0/CDT-allJoynSvcObject-v2_30_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_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v2_30_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-areaNwkDeviceInfo-v2_30_0.xsd b/v2_30_0/CDT-areaNwkDeviceInfo-v2_30_0.xsd
index a865ef5..fc3193a 100644
--- a/v2_30_0/CDT-areaNwkDeviceInfo-v2_30_0.xsd
+++ b/v2_30_0/CDT-areaNwkDeviceInfo-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-areaNwkInfo-v2_30_0.xsd b/v2_30_0/CDT-areaNwkInfo-v2_30_0.xsd
index 8390195..130f07a 100644
--- a/v2_30_0/CDT-areaNwkInfo-v2_30_0.xsd
+++ b/v2_30_0/CDT-areaNwkInfo-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-battery-v2_30_0.xsd b/v2_30_0/CDT-battery-v2_30_0.xsd
index 0b62a43..969eef8 100644
--- a/v2_30_0/CDT-battery-v2_30_0.xsd
+++ b/v2_30_0/CDT-battery-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-cmdhBuffer-v2_30_0.xsd b/v2_30_0/CDT-cmdhBuffer-v2_30_0.xsd
index f94075c..f1b37ca 100644
--- a/v2_30_0/CDT-cmdhBuffer-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhBuffer-v2_30_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_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_30_0/CDT-cmdhDefEcValue-v2_30_0.xsd b/v2_30_0/CDT-cmdhDefEcValue-v2_30_0.xsd
index 3552ba5..61d1f92 100644
--- a/v2_30_0/CDT-cmdhDefEcValue-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhDefEcValue-v2_30_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_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_30_0/CDT-cmdhDefaults-v2_30_0.xsd b/v2_30_0/CDT-cmdhDefaults-v2_30_0.xsd
index 8723399..a4d7dfd 100644
--- a/v2_30_0/CDT-cmdhDefaults-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhDefaults-v2_30_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_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_30_0/CDT-cmdhEcDefParamValues-v2_30_0.xsd b/v2_30_0/CDT-cmdhEcDefParamValues-v2_30_0.xsd
index d9e0477..09e0df1 100644
--- a/v2_30_0/CDT-cmdhEcDefParamValues-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhEcDefParamValues-v2_30_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_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_30_0/CDT-cmdhLimits-v2_30_0.xsd b/v2_30_0/CDT-cmdhLimits-v2_30_0.xsd
index f8880a3..c9a7cb9 100644
--- a/v2_30_0/CDT-cmdhLimits-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhLimits-v2_30_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_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_30_0/CDT-cmdhNetworkAccessRules-v2_30_0.xsd b/v2_30_0/CDT-cmdhNetworkAccessRules-v2_30_0.xsd
index 3c992f9..48e7388 100644
--- a/v2_30_0/CDT-cmdhNetworkAccessRules-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhNetworkAccessRules-v2_30_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_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_30_0/CDT-cmdhNwAccessRule-v2_30_0.xsd b/v2_30_0/CDT-cmdhNwAccessRule-v2_30_0.xsd
index a29499a..793fe80 100644
--- a/v2_30_0/CDT-cmdhNwAccessRule-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhNwAccessRule-v2_30_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_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_30_0/CDT-cmdhPolicy-v2_30_0.xsd b/v2_30_0/CDT-cmdhPolicy-v2_30_0.xsd
index 42e4e8a..177f6c8 100644
--- a/v2_30_0/CDT-cmdhPolicy-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhPolicy-v2_30_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_29_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_30_0/CDT-commonTypes-v2_30_0.xsd b/v2_30_0/CDT-commonTypes-v2_30_0.xsd
index 5221aad..49196a1 100644
--- a/v2_30_0/CDT-commonTypes-v2_30_0.xsd
+++ b/v2_30_0/CDT-commonTypes-v2_30_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_29_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_30_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_30_0/CDT-container-v2_30_0.xsd b/v2_30_0/CDT-container-v2_30_0.xsd
index 7c9d64a..78e35a4 100644
--- a/v2_30_0/CDT-container-v2_30_0.xsd
+++ b/v2_30_0/CDT-container-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_30_0/CDT-contentInstance-v2_30_0.xsd b/v2_30_0/CDT-contentInstance-v2_30_0.xsd
index ccd8e7f..8988686 100644
--- a/v2_30_0/CDT-contentInstance-v2_30_0.xsd
+++ b/v2_30_0/CDT-contentInstance-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-delivery-v2_30_0.xsd b/v2_30_0/CDT-delivery-v2_30_0.xsd
index 8a09d09..4af2241 100644
--- a/v2_30_0/CDT-delivery-v2_30_0.xsd
+++ b/v2_30_0/CDT-delivery-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_30_0/CDT-deviceCapability-v2_30_0.xsd b/v2_30_0/CDT-deviceCapability-v2_30_0.xsd
index f4cdc2d..9e79a5b 100644
--- a/v2_30_0/CDT-deviceCapability-v2_30_0.xsd
+++ b/v2_30_0/CDT-deviceCapability-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-deviceInfo-v2_30_0.xsd b/v2_30_0/CDT-deviceInfo-v2_30_0.xsd
index 6ca0cfa..e960a27 100644
--- a/v2_30_0/CDT-deviceInfo-v2_30_0.xsd
+++ b/v2_30_0/CDT-deviceInfo-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-dynamicAuthorizationConsultation-v2_30_0.xsd b/v2_30_0/CDT-dynamicAuthorizationConsultation-v2_30_0.xsd
index 29f0d07..71ec0cc 100644
--- a/v2_30_0/CDT-dynamicAuthorizationConsultation-v2_30_0.xsd
+++ b/v2_30_0/CDT-dynamicAuthorizationConsultation-v2_30_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_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-eventConfig-v2_30_0.xsd b/v2_30_0/CDT-eventConfig-v2_30_0.xsd
index f3929a3..546d5ae 100644
--- a/v2_30_0/CDT-eventConfig-v2_30_0.xsd
+++ b/v2_30_0/CDT-eventConfig-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-eventLog-v2_30_0.xsd b/v2_30_0/CDT-eventLog-v2_30_0.xsd
index 979e1fe..f940a39 100644
--- a/v2_30_0/CDT-eventLog-v2_30_0.xsd
+++ b/v2_30_0/CDT-eventLog-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-execInstance-v2_30_0.xsd b/v2_30_0/CDT-execInstance-v2_30_0.xsd
index b7ab8cc..9a08f5d 100644
--- a/v2_30_0/CDT-execInstance-v2_30_0.xsd
+++ b/v2_30_0/CDT-execInstance-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-firmware-v2_30_0.xsd b/v2_30_0/CDT-firmware-v2_30_0.xsd
index 8b5e255..9386867 100644
--- a/v2_30_0/CDT-firmware-v2_30_0.xsd
+++ b/v2_30_0/CDT-firmware-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-genericInterworkingOperationInstance-v2_30_0.xsd b/v2_30_0/CDT-genericInterworkingOperationInstance-v2_30_0.xsd
index 7835be9..fded479 100644
--- a/v2_30_0/CDT-genericInterworkingOperationInstance-v2_30_0.xsd
+++ b/v2_30_0/CDT-genericInterworkingOperationInstance-v2_30_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_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-genericInterworkingService-v2_30_0.xsd b/v2_30_0/CDT-genericInterworkingService-v2_30_0.xsd
index f5ac2be..08898b2 100644
--- a/v2_30_0/CDT-genericInterworkingService-v2_30_0.xsd
+++ b/v2_30_0/CDT-genericInterworkingService-v2_30_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_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_30_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-group-v2_30_0.xsd b/v2_30_0/CDT-group-v2_30_0.xsd
index 15003b9..1d8eb08 100644
--- a/v2_30_0/CDT-group-v2_30_0.xsd
+++ b/v2_30_0/CDT-group-v2_30_0.xsd
@@ -29,9 +29,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_29_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd"/>
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-locationPolicy-v2_30_0.xsd b/v2_30_0/CDT-locationPolicy-v2_30_0.xsd
index b59ac91..eca47cc 100644
--- a/v2_30_0/CDT-locationPolicy-v2_30_0.xsd
+++ b/v2_30_0/CDT-locationPolicy-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-m2mServiceSubscriptionProfile-v2_30_0.xsd b/v2_30_0/CDT-m2mServiceSubscriptionProfile-v2_30_0.xsd
index 319b98f..18f1183 100644
--- a/v2_30_0/CDT-m2mServiceSubscriptionProfile-v2_30_0.xsd
+++ b/v2_30_0/CDT-m2mServiceSubscriptionProfile-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_30_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-memory-v2_30_0.xsd b/v2_30_0/CDT-memory-v2_30_0.xsd
index e16b74b..1d2df42 100644
--- a/v2_30_0/CDT-memory-v2_30_0.xsd
+++ b/v2_30_0/CDT-memory-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-mgmtCmd-v2_30_0.xsd b/v2_30_0/CDT-mgmtCmd-v2_30_0.xsd
index 06327fa..9096a55 100644
--- a/v2_30_0/CDT-mgmtCmd-v2_30_0.xsd
+++ b/v2_30_0/CDT-mgmtCmd-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_30_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-node-v2_30_0.xsd b/v2_30_0/CDT-node-v2_30_0.xsd
index 92bbb5a..3809b16 100644
--- a/v2_30_0/CDT-node-v2_30_0.xsd
+++ b/v2_30_0/CDT-node-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_30_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-notification-v2_30_0.xsd b/v2_30_0/CDT-notification-v2_30_0.xsd
index 02af075..442ec9b 100644
--- a/v2_30_0/CDT-notification-v2_30_0.xsd
+++ b/v2_30_0/CDT-notification-v2_30_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_29_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_29_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_30_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_30_0/CDT-notificationTargetMgmtPolicyRef-v2_30_0.xsd b/v2_30_0/CDT-notificationTargetMgmtPolicyRef-v2_30_0.xsd
index a0c0003..8f42f0d 100644
--- a/v2_30_0/CDT-notificationTargetMgmtPolicyRef-v2_30_0.xsd
+++ b/v2_30_0/CDT-notificationTargetMgmtPolicyRef-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-notificationTargetPolicy-v2_30_0.xsd b/v2_30_0/CDT-notificationTargetPolicy-v2_30_0.xsd
index d7dab74..f07741d 100644
--- a/v2_30_0/CDT-notificationTargetPolicy-v2_30_0.xsd
+++ b/v2_30_0/CDT-notificationTargetPolicy-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-policyDeletionRules-v2_30_0.xsd b/v2_30_0/CDT-policyDeletionRules-v2_30_0.xsd
index b7bfbb1..a8821c4 100644
--- a/v2_30_0/CDT-policyDeletionRules-v2_30_0.xsd
+++ b/v2_30_0/CDT-policyDeletionRules-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-pollingChannel-v2_30_0.xsd b/v2_30_0/CDT-pollingChannel-v2_30_0.xsd
index c3e4530..6b95fc0 100644
--- a/v2_30_0/CDT-pollingChannel-v2_30_0.xsd
+++ b/v2_30_0/CDT-pollingChannel-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-reboot-v2_30_0.xsd b/v2_30_0/CDT-reboot-v2_30_0.xsd
index 717e12a..0756c96 100644
--- a/v2_30_0/CDT-reboot-v2_30_0.xsd
+++ b/v2_30_0/CDT-reboot-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-remoteCSE-v2_30_0.xsd b/v2_30_0/CDT-remoteCSE-v2_30_0.xsd
index aef8176..77f429b 100644
--- a/v2_30_0/CDT-remoteCSE-v2_30_0.xsd
+++ b/v2_30_0/CDT-remoteCSE-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_30_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-request-v2_30_0.xsd b/v2_30_0/CDT-request-v2_30_0.xsd
index cdd3d60..ef38fd7 100644
--- a/v2_30_0/CDT-request-v2_30_0.xsd
+++ b/v2_30_0/CDT-request-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-requestPrimitive-v2_30_0.xsd b/v2_30_0/CDT-requestPrimitive-v2_30_0.xsd
index 82e443e..a6db705 100644
--- a/v2_30_0/CDT-requestPrimitive-v2_30_0.xsd
+++ b/v2_30_0/CDT-requestPrimitive-v2_30_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_29_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_30_0/CDT-responsePrimitive-v2_30_0.xsd b/v2_30_0/CDT-responsePrimitive-v2_30_0.xsd
index b30e60f..635a1ab 100644
--- a/v2_30_0/CDT-responsePrimitive-v2_30_0.xsd
+++ b/v2_30_0/CDT-responsePrimitive-v2_30_0.xsd
@@ -28,54 +28,54 @@ 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_29_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_29_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_29_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_30_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_30_0/CDT-role-v2_30_0.xsd b/v2_30_0/CDT-role-v2_30_0.xsd
index d3d8f52..0362227 100644
--- a/v2_30_0/CDT-role-v2_30_0.xsd
+++ b/v2_30_0/CDT-role-v2_30_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_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-schedule-v2_30_0.xsd b/v2_30_0/CDT-schedule-v2_30_0.xsd
index 889632d..f65ba33 100644
--- a/v2_30_0/CDT-schedule-v2_30_0.xsd
+++ b/v2_30_0/CDT-schedule-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-semanticDescriptor-v2_30_0.xsd b/v2_30_0/CDT-semanticDescriptor-v2_30_0.xsd
index 3c7a748..f2586b9 100644
--- a/v2_30_0/CDT-semanticDescriptor-v2_30_0.xsd
+++ b/v2_30_0/CDT-semanticDescriptor-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-serviceSubscribedAppRule-v2_30_0.xsd b/v2_30_0/CDT-serviceSubscribedAppRule-v2_30_0.xsd
index bea0a66..a6c715f 100644
--- a/v2_30_0/CDT-serviceSubscribedAppRule-v2_30_0.xsd
+++ b/v2_30_0/CDT-serviceSubscribedAppRule-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-serviceSubscribedNode-v2_30_0.xsd b/v2_30_0/CDT-serviceSubscribedNode-v2_30_0.xsd
index b2b298a..fde53bd 100644
--- a/v2_30_0/CDT-serviceSubscribedNode-v2_30_0.xsd
+++ b/v2_30_0/CDT-serviceSubscribedNode-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-software-v2_30_0.xsd b/v2_30_0/CDT-software-v2_30_0.xsd
index ed10bd4..3b3be66 100644
--- a/v2_30_0/CDT-software-v2_30_0.xsd
+++ b/v2_30_0/CDT-software-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-statsCollect-v2_30_0.xsd b/v2_30_0/CDT-statsCollect-v2_30_0.xsd
index 1c5fd86..c2e3319 100644
--- a/v2_30_0/CDT-statsCollect-v2_30_0.xsd
+++ b/v2_30_0/CDT-statsCollect-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-statsConfig-v2_30_0.xsd b/v2_30_0/CDT-statsConfig-v2_30_0.xsd
index 3862b57..2e22aaa 100644
--- a/v2_30_0/CDT-statsConfig-v2_30_0.xsd
+++ b/v2_30_0/CDT-statsConfig-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-subscription-v2_30_0.xsd b/v2_30_0/CDT-subscription-v2_30_0.xsd
index abaad11..a478fb8 100644
--- a/v2_30_0/CDT-subscription-v2_30_0.xsd
+++ b/v2_30_0/CDT-subscription-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_30_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-svcFwWrapper-v2_30_0.xsd b/v2_30_0/CDT-svcFwWrapper-v2_30_0.xsd
index c4d3ade..1f0fd10 100644
--- a/v2_30_0/CDT-svcFwWrapper-v2_30_0.xsd
+++ b/v2_30_0/CDT-svcFwWrapper-v2_30_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_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-svcObjWrapper-v2_30_0.xsd b/v2_30_0/CDT-svcObjWrapper-v2_30_0.xsd
index 3c5fbdc..a4a5c6e 100644
--- a/v2_30_0/CDT-svcObjWrapper-v2_30_0.xsd
+++ b/v2_30_0/CDT-svcObjWrapper-v2_30_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_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v2_30_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-timeSeries-v2_30_0.xsd b/v2_30_0/CDT-timeSeries-v2_30_0.xsd
index 5448515..0b7c118 100644
--- a/v2_30_0/CDT-timeSeries-v2_30_0.xsd
+++ b/v2_30_0/CDT-timeSeries-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_30_0/CDT-timeSeriesInstance-v2_30_0.xsd b/v2_30_0/CDT-timeSeriesInstance-v2_30_0.xsd
index ce701af..35635c7 100644
--- a/v2_30_0/CDT-timeSeriesInstance-v2_30_0.xsd
+++ b/v2_30_0/CDT-timeSeriesInstance-v2_30_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_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-token-v2_30_0.xsd b/v2_30_0/CDT-token-v2_30_0.xsd
index a530ae7..e262f06 100644
--- a/v2_30_0/CDT-token-v2_30_0.xsd
+++ b/v2_30_0/CDT-token-v2_30_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_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_30_0/CDT-trafficPattern-v2_30_0.xsd b/v2_30_0/CDT-trafficPattern-v2_30_0.xsd
index 8191bee..553f112 100644
--- a/v2_30_0/CDT-trafficPattern-v2_30_0.xsd
+++ b/v2_30_0/CDT-trafficPattern-v2_30_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_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab