From 0913a7ad39c3e7cd1419e717a853e8f2290fa386 Mon Sep 17 00:00:00 2001
From: Peter Niblett <peter_niblett@uk.ibm.com>
Date: Mon, 2 Oct 2023 21:39:54 +0100
Subject: [PATCH] Change include statements to reference 2_34_0

---
 v3_30_0/CDT-AE-v3_30_0.xsd                    | 28 +++---
 v3_30_0/CDT-AEContactList-v3_30_0.xsd         |  8 +-
 v3_30_0/CDT-AEContactListPerCSE-v3_30_0.xsd   |  2 +-
 v3_30_0/CDT-CSEBase-v3_30_0.xsd               | 64 ++++++-------
 v3_30_0/CDT-accessControlPolicy-v3_30_0.xsd   |  6 +-
 v3_30_0/CDT-activeCmdhPolicy-v3_30_0.xsd      |  2 +-
 v3_30_0/CDT-allJoynApp-v3_30_0.xsd            |  8 +-
 v3_30_0/CDT-allJoynInterface-v3_30_0.xsd      | 12 +--
 v3_30_0/CDT-allJoynMethod-v3_30_0.xsd         |  8 +-
 v3_30_0/CDT-allJoynMethodCall-v3_30_0.xsd     |  6 +-
 v3_30_0/CDT-allJoynProperty-v3_30_0.xsd       |  6 +-
 v3_30_0/CDT-allJoynSvcObject-v3_30_0.xsd      |  8 +-
 v3_30_0/CDT-areaNwkDeviceInfo-v3_30_0.xsd     |  4 +-
 v3_30_0/CDT-areaNwkInfo-v3_30_0.xsd           |  4 +-
 v3_30_0/CDT-authorizationDecision-v3_30_0.xsd |  6 +-
 .../CDT-authorizationInformation-v3_30_0.xsd  | 10 +-
 v3_30_0/CDT-authorizationPolicy-v3_30_0.xsd   |  6 +-
 .../CDT-backgroundDataTransfer-v3_30_0.xsd    |  4 +-
 v3_30_0/CDT-battery-v3_30_0.xsd               |  4 +-
 v3_30_0/CDT-cmdhBuffer-v3_30_0.xsd            |  2 +-
 v3_30_0/CDT-cmdhDefEcValue-v3_30_0.xsd        |  2 +-
 v3_30_0/CDT-cmdhDefaults-v3_30_0.xsd          |  2 +-
 v3_30_0/CDT-cmdhEcDefParamValues-v3_30_0.xsd  |  2 +-
 v3_30_0/CDT-cmdhLimits-v3_30_0.xsd            |  2 +-
 .../CDT-cmdhNetworkAccessRules-v3_30_0.xsd    |  2 +-
 v3_30_0/CDT-cmdhNwAccessRule-v3_30_0.xsd      |  2 +-
 v3_30_0/CDT-cmdhPolicy-v3_30_0.xsd            |  2 +-
 v3_30_0/CDT-commonTypes-v3_30_0.xsd           |  2 +-
 v3_30_0/CDT-container-v3_30_0.xsd             | 12 +--
 v3_30_0/CDT-contentInstance-v3_30_0.xsd       |  6 +-
 .../CDT-crossResourceSubscription-v3_30_0.xsd |  8 +-
 v3_30_0/CDT-delivery-v3_30_0.xsd              |  4 +-
 v3_30_0/CDT-deviceCapability-v3_30_0.xsd      |  4 +-
 v3_30_0/CDT-deviceInfo-v3_30_0.xsd            |  4 +-
 ...namicAuthorizationConsultation-v3_30_0.xsd |  6 +-
 v3_30_0/CDT-eventConfig-v3_30_0.xsd           |  6 +-
 v3_30_0/CDT-eventLog-v3_30_0.xsd              |  4 +-
 v3_30_0/CDT-execInstance-v3_30_0.xsd          |  6 +-
 v3_30_0/CDT-firmware-v3_30_0.xsd              |  4 +-
 v3_30_0/CDT-group-v3_30_0.xsd                 |  8 +-
 v3_30_0/CDT-localMulticastGroup-v3_30_0.xsd   |  4 +-
 v3_30_0/CDT-locationPolicy-v3_30_0.xsd        |  6 +-
 ...-m2mServiceSubscriptionProfile-v3_30_0.xsd |  8 +-
 v3_30_0/CDT-memory-v3_30_0.xsd                |  4 +-
 v3_30_0/CDT-mgmtCmd-v3_30_0.xsd               |  8 +-
 v3_30_0/CDT-multimediaSession-v3_30_0.xsd     |  6 +-
 v3_30_0/CDT-node-v3_30_0.xsd                  | 34 +++----
 v3_30_0/CDT-notification-v3_30_0.xsd          |  4 +-
 ...otificationTargetMgmtPolicyRef-v3_30_0.xsd |  6 +-
 .../CDT-notificationTargetPolicy-v3_30_0.xsd  |  8 +-
 v3_30_0/CDT-ontology-v3_30_0.xsd              |  6 +-
 v3_30_0/CDT-ontologyRepository-v3_30_0.xsd    |  8 +-
 v3_30_0/CDT-policyDeletionRules-v3_30_0.xsd   |  6 +-
 v3_30_0/CDT-pollingChannel-v3_30_0.xsd        |  6 +-
 v3_30_0/CDT-reboot-v3_30_0.xsd                |  4 +-
 v3_30_0/CDT-remoteCSE-v3_30_0.xsd             | 32 +++----
 v3_30_0/CDT-request-v3_30_0.xsd               |  4 +-
 v3_30_0/CDT-requestPrimitive-v3_30_0.xsd      |  2 +-
 v3_30_0/CDT-responsePrimitive-v3_30_0.xsd     | 96 +++++++++----------
 v3_30_0/CDT-role-v3_30_0.xsd                  |  6 +-
 v3_30_0/CDT-schedule-v3_30_0.xsd              |  4 +-
 v3_30_0/CDT-semanticDescriptor-v3_30_0.xsd    |  6 +-
 .../CDT-semanticMashupInstance-v3_30_0.xsd    | 10 +-
 .../CDT-semanticMashupJobProfile-v3_30_0.xsd  | 10 +-
 v3_30_0/CDT-semanticMashupResult-v3_30_0.xsd  |  6 +-
 .../CDT-serviceSubscribedAppRule-v3_30_0.xsd  |  6 +-
 v3_30_0/CDT-serviceSubscribedNode-v3_30_0.xsd |  6 +-
 v3_30_0/CDT-software-v3_30_0.xsd              |  4 +-
 v3_30_0/CDT-statsCollect-v3_30_0.xsd          |  6 +-
 v3_30_0/CDT-statsConfig-v3_30_0.xsd           |  8 +-
 v3_30_0/CDT-subscription-v3_30_0.xsd          |  8 +-
 v3_30_0/CDT-svcFwWrapper-v3_30_0.xsd          |  6 +-
 v3_30_0/CDT-svcObjWrapper-v3_30_0.xsd         |  8 +-
 v3_30_0/CDT-timeSeries-v3_30_0.xsd            | 10 +-
 v3_30_0/CDT-timeSeriesInstance-v3_30_0.xsd    |  6 +-
 .../CDT-timeSeriesNotification-v3_30_0.xsd    |  2 +-
 v3_30_0/CDT-token-v3_30_0.xsd                 |  6 +-
 v3_30_0/CDT-transaction-v3_30_0.xsd           |  6 +-
 v3_30_0/CDT-transactionMgmt-v3_30_0.xsd       |  6 +-
 v3_30_0/CDT-triggerPayload-v3_30_0.xsd        |  2 +-
 v3_30_0/CDT-triggerRequest-v3_30_0.xsd        |  6 +-
 81 files changed, 338 insertions(+), 338 deletions(-)

diff --git a/v3_30_0/CDT-AE-v3_30_0.xsd b/v3_30_0/CDT-AE-v3_30_0.xsd
index 14679a8..ffe7db6 100644
--- a/v3_30_0/CDT-AE-v3_30_0.xsd
+++ b/v3_30_0/CDT-AE-v3_30_0.xsd
@@ -26,20 +26,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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-triggerRequest-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-triggerRequest-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-AEContactList-v3_30_0.xsd b/v3_30_0/CDT-AEContactList-v3_30_0.xsd
index cacb227..33e5f65 100644
--- a/v3_30_0/CDT-AEContactList-v3_30_0.xsd
+++ b/v3_30_0/CDT-AEContactList-v3_30_0.xsd
@@ -27,10 +27,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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-AEContactListPerCSE-v3_30_0.xsd b/v3_30_0/CDT-AEContactListPerCSE-v3_30_0.xsd
index 6a76867..3f5ab07 100644
--- a/v3_30_0/CDT-AEContactListPerCSE-v3_30_0.xsd
+++ b/v3_30_0/CDT-AEContactListPerCSE-v3_30_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-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-CSEBase-v3_30_0.xsd b/v3_30_0/CDT-CSEBase-v3_30_0.xsd
index 4b7537b..06b148a 100644
--- a/v3_30_0/CDT-CSEBase-v3_30_0.xsd
+++ b/v3_30_0/CDT-CSEBase-v3_30_0.xsd
@@ -26,38 +26,38 @@ 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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_29_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_29_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-transactionMgmt-v3_29_0.xsd" />
-    <xs:include schemaLocation="CDT-transaction-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_30_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_30_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-transactionMgmt-v3_30_0.xsd" />
+    <xs:include schemaLocation="CDT-transaction-v3_30_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-accessControlPolicy-v3_30_0.xsd b/v3_30_0/CDT-accessControlPolicy-v3_30_0.xsd
index 46f16bd..4a726a5 100644
--- a/v3_30_0/CDT-accessControlPolicy-v3_30_0.xsd
+++ b/v3_30_0/CDT-accessControlPolicy-v3_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" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd"/>
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-activeCmdhPolicy-v3_30_0.xsd b/v3_30_0/CDT-activeCmdhPolicy-v3_30_0.xsd
index f01c09d..d2610ea 100644
--- a/v3_30_0/CDT-activeCmdhPolicy-v3_30_0.xsd
+++ b/v3_30_0/CDT-activeCmdhPolicy-v3_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-v3_29_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_30_0/CDT-allJoynApp-v3_30_0.xsd b/v3_30_0/CDT-allJoynApp-v3_30_0.xsd
index faa55d5..1297667 100644
--- a/v3_30_0/CDT-allJoynApp-v3_30_0.xsd
+++ b/v3_30_0/CDT-allJoynApp-v3_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-v3_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_30_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-allJoynInterface-v3_30_0.xsd b/v3_30_0/CDT-allJoynInterface-v3_30_0.xsd
index 9c551fc..2b891a6 100644
--- a/v3_30_0/CDT-allJoynInterface-v3_30_0.xsd
+++ b/v3_30_0/CDT-allJoynInterface-v3_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-v3_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_30_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_30_0/CDT-allJoynMethod-v3_30_0.xsd b/v3_30_0/CDT-allJoynMethod-v3_30_0.xsd
index c80aaa1..7e71bed 100644
--- a/v3_30_0/CDT-allJoynMethod-v3_30_0.xsd
+++ b/v3_30_0/CDT-allJoynMethod-v3_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-v3_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_30_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_30_0/CDT-allJoynMethodCall-v3_30_0.xsd b/v3_30_0/CDT-allJoynMethodCall-v3_30_0.xsd
index db0fa28..b278790 100644
--- a/v3_30_0/CDT-allJoynMethodCall-v3_30_0.xsd
+++ b/v3_30_0/CDT-allJoynMethodCall-v3_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-v3_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-allJoynProperty-v3_30_0.xsd b/v3_30_0/CDT-allJoynProperty-v3_30_0.xsd
index f2b83c4..f99c696 100644
--- a/v3_30_0/CDT-allJoynProperty-v3_30_0.xsd
+++ b/v3_30_0/CDT-allJoynProperty-v3_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-v3_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-allJoynSvcObject-v3_30_0.xsd b/v3_30_0/CDT-allJoynSvcObject-v3_30_0.xsd
index 5641e46..72f30ad 100644
--- a/v3_30_0/CDT-allJoynSvcObject-v3_30_0.xsd
+++ b/v3_30_0/CDT-allJoynSvcObject-v3_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-v3_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_30_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-areaNwkDeviceInfo-v3_30_0.xsd b/v3_30_0/CDT-areaNwkDeviceInfo-v3_30_0.xsd
index 75d0dd4..48b3eb2 100644
--- a/v3_30_0/CDT-areaNwkDeviceInfo-v3_30_0.xsd
+++ b/v3_30_0/CDT-areaNwkDeviceInfo-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-areaNwkInfo-v3_30_0.xsd b/v3_30_0/CDT-areaNwkInfo-v3_30_0.xsd
index 89c6d2e..34915ce 100644
--- a/v3_30_0/CDT-areaNwkInfo-v3_30_0.xsd
+++ b/v3_30_0/CDT-areaNwkInfo-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-authorizationDecision-v3_30_0.xsd b/v3_30_0/CDT-authorizationDecision-v3_30_0.xsd
index 1756a18..d3be918 100644
--- a/v3_30_0/CDT-authorizationDecision-v3_30_0.xsd
+++ b/v3_30_0/CDT-authorizationDecision-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-authorizationInformation-v3_30_0.xsd b/v3_30_0/CDT-authorizationInformation-v3_30_0.xsd
index 7c7b55e..93f323f 100644
--- a/v3_30_0/CDT-authorizationInformation-v3_30_0.xsd
+++ b/v3_30_0/CDT-authorizationInformation-v3_30_0.xsd
@@ -26,11 +26,11 @@ 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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-authorizationPolicy-v3_30_0.xsd b/v3_30_0/CDT-authorizationPolicy-v3_30_0.xsd
index fe3b66d..8fca61c 100644
--- a/v3_30_0/CDT-authorizationPolicy-v3_30_0.xsd
+++ b/v3_30_0/CDT-authorizationPolicy-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-backgroundDataTransfer-v3_30_0.xsd b/v3_30_0/CDT-backgroundDataTransfer-v3_30_0.xsd
index 97f8558..86b47c4 100644
--- a/v3_30_0/CDT-backgroundDataTransfer-v3_30_0.xsd
+++ b/v3_30_0/CDT-backgroundDataTransfer-v3_30_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 
 	<xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-battery-v3_30_0.xsd b/v3_30_0/CDT-battery-v3_30_0.xsd
index 8f68990..67cf984 100644
--- a/v3_30_0/CDT-battery-v3_30_0.xsd
+++ b/v3_30_0/CDT-battery-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-cmdhBuffer-v3_30_0.xsd b/v3_30_0/CDT-cmdhBuffer-v3_30_0.xsd
index 3c9f1fb..16bb0de 100644
--- a/v3_30_0/CDT-cmdhBuffer-v3_30_0.xsd
+++ b/v3_30_0/CDT-cmdhBuffer-v3_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-v3_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_30_0/CDT-cmdhDefEcValue-v3_30_0.xsd b/v3_30_0/CDT-cmdhDefEcValue-v3_30_0.xsd
index 615bcc3..d1c7406 100644
--- a/v3_30_0/CDT-cmdhDefEcValue-v3_30_0.xsd
+++ b/v3_30_0/CDT-cmdhDefEcValue-v3_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-v3_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_30_0/CDT-cmdhDefaults-v3_30_0.xsd b/v3_30_0/CDT-cmdhDefaults-v3_30_0.xsd
index 29c9edd..c6b7053 100644
--- a/v3_30_0/CDT-cmdhDefaults-v3_30_0.xsd
+++ b/v3_30_0/CDT-cmdhDefaults-v3_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-v3_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_30_0/CDT-cmdhEcDefParamValues-v3_30_0.xsd b/v3_30_0/CDT-cmdhEcDefParamValues-v3_30_0.xsd
index 423b359..d1da40d 100644
--- a/v3_30_0/CDT-cmdhEcDefParamValues-v3_30_0.xsd
+++ b/v3_30_0/CDT-cmdhEcDefParamValues-v3_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-v3_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_30_0/CDT-cmdhLimits-v3_30_0.xsd b/v3_30_0/CDT-cmdhLimits-v3_30_0.xsd
index 9f011a6..7f983fc 100644
--- a/v3_30_0/CDT-cmdhLimits-v3_30_0.xsd
+++ b/v3_30_0/CDT-cmdhLimits-v3_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-v3_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_30_0/CDT-cmdhNetworkAccessRules-v3_30_0.xsd b/v3_30_0/CDT-cmdhNetworkAccessRules-v3_30_0.xsd
index b143238..c962d92 100644
--- a/v3_30_0/CDT-cmdhNetworkAccessRules-v3_30_0.xsd
+++ b/v3_30_0/CDT-cmdhNetworkAccessRules-v3_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-v3_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_30_0/CDT-cmdhNwAccessRule-v3_30_0.xsd b/v3_30_0/CDT-cmdhNwAccessRule-v3_30_0.xsd
index 4e27adc..7c2ebef 100644
--- a/v3_30_0/CDT-cmdhNwAccessRule-v3_30_0.xsd
+++ b/v3_30_0/CDT-cmdhNwAccessRule-v3_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-v3_29_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_30_0/CDT-cmdhPolicy-v3_30_0.xsd b/v3_30_0/CDT-cmdhPolicy-v3_30_0.xsd
index 69d4fbc..0c084b8 100644
--- a/v3_30_0/CDT-cmdhPolicy-v3_30_0.xsd
+++ b/v3_30_0/CDT-cmdhPolicy-v3_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-v3_29_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_30_0/CDT-commonTypes-v3_30_0.xsd b/v3_30_0/CDT-commonTypes-v3_30_0.xsd
index 5a44fb8..5ee2767 100644
--- a/v3_30_0/CDT-commonTypes-v3_30_0.xsd
+++ b/v3_30_0/CDT-commonTypes-v3_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-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_30_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_30_0/CDT-container-v3_30_0.xsd b/v3_30_0/CDT-container-v3_30_0.xsd
index f96b2f3..41c4ac1 100644
--- a/v3_30_0/CDT-container-v3_30_0.xsd
+++ b/v3_30_0/CDT-container-v3_30_0.xsd
@@ -26,12 +26,12 @@ 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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_30_0/CDT-contentInstance-v3_30_0.xsd b/v3_30_0/CDT-contentInstance-v3_30_0.xsd
index cfcc27d..2238700 100644
--- a/v3_30_0/CDT-contentInstance-v3_30_0.xsd
+++ b/v3_30_0/CDT-contentInstance-v3_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-crossResourceSubscription-v3_30_0.xsd b/v3_30_0/CDT-crossResourceSubscription-v3_30_0.xsd
index 78834e3..b7a1c63 100644
--- a/v3_30_0/CDT-crossResourceSubscription-v3_30_0.xsd
+++ b/v3_30_0/CDT-crossResourceSubscription-v3_30_0.xsd
@@ -27,10 +27,10 @@ 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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-delivery-v3_30_0.xsd b/v3_30_0/CDT-delivery-v3_30_0.xsd
index e17fa85..2fc302c 100644
--- a/v3_30_0/CDT-delivery-v3_30_0.xsd
+++ b/v3_30_0/CDT-delivery-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_30_0/CDT-deviceCapability-v3_30_0.xsd b/v3_30_0/CDT-deviceCapability-v3_30_0.xsd
index 2297338..d82bc23 100644
--- a/v3_30_0/CDT-deviceCapability-v3_30_0.xsd
+++ b/v3_30_0/CDT-deviceCapability-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-deviceInfo-v3_30_0.xsd b/v3_30_0/CDT-deviceInfo-v3_30_0.xsd
index 0fa65b5..98ad8c8 100644
--- a/v3_30_0/CDT-deviceInfo-v3_30_0.xsd
+++ b/v3_30_0/CDT-deviceInfo-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-dynamicAuthorizationConsultation-v3_30_0.xsd b/v3_30_0/CDT-dynamicAuthorizationConsultation-v3_30_0.xsd
index d88b486..4c59aa8 100644
--- a/v3_30_0/CDT-dynamicAuthorizationConsultation-v3_30_0.xsd
+++ b/v3_30_0/CDT-dynamicAuthorizationConsultation-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-eventConfig-v3_30_0.xsd b/v3_30_0/CDT-eventConfig-v3_30_0.xsd
index 47aa082..cfc7a06 100644
--- a/v3_30_0/CDT-eventConfig-v3_30_0.xsd
+++ b/v3_30_0/CDT-eventConfig-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-eventLog-v3_30_0.xsd b/v3_30_0/CDT-eventLog-v3_30_0.xsd
index d7a9bfe..44c38d9 100644
--- a/v3_30_0/CDT-eventLog-v3_30_0.xsd
+++ b/v3_30_0/CDT-eventLog-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-execInstance-v3_30_0.xsd b/v3_30_0/CDT-execInstance-v3_30_0.xsd
index c2e6b72..29af342 100644
--- a/v3_30_0/CDT-execInstance-v3_30_0.xsd
+++ b/v3_30_0/CDT-execInstance-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-firmware-v3_30_0.xsd b/v3_30_0/CDT-firmware-v3_30_0.xsd
index 795e586..52ce988 100644
--- a/v3_30_0/CDT-firmware-v3_30_0.xsd
+++ b/v3_30_0/CDT-firmware-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-group-v3_30_0.xsd b/v3_30_0/CDT-group-v3_30_0.xsd
index bd30a14..ae0a098 100644
--- a/v3_30_0/CDT-group-v3_30_0.xsd
+++ b/v3_30_0/CDT-group-v3_30_0.xsd
@@ -27,10 +27,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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 	
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_30_0/CDT-localMulticastGroup-v3_30_0.xsd b/v3_30_0/CDT-localMulticastGroup-v3_30_0.xsd
index 6c9ea4b..62c697d 100644
--- a/v3_30_0/CDT-localMulticastGroup-v3_30_0.xsd
+++ b/v3_30_0/CDT-localMulticastGroup-v3_30_0.xsd
@@ -27,10 +27,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-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_29_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_30_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_30_0/CDT-locationPolicy-v3_30_0.xsd b/v3_30_0/CDT-locationPolicy-v3_30_0.xsd
index a9a09c6..71f9d91 100644
--- a/v3_30_0/CDT-locationPolicy-v3_30_0.xsd
+++ b/v3_30_0/CDT-locationPolicy-v3_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-m2mServiceSubscriptionProfile-v3_30_0.xsd b/v3_30_0/CDT-m2mServiceSubscriptionProfile-v3_30_0.xsd
index ad52865..d3bef09 100644
--- a/v3_30_0/CDT-m2mServiceSubscriptionProfile-v3_30_0.xsd
+++ b/v3_30_0/CDT-m2mServiceSubscriptionProfile-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-memory-v3_30_0.xsd b/v3_30_0/CDT-memory-v3_30_0.xsd
index 9b69876..bd75c9e 100644
--- a/v3_30_0/CDT-memory-v3_30_0.xsd
+++ b/v3_30_0/CDT-memory-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-mgmtCmd-v3_30_0.xsd b/v3_30_0/CDT-mgmtCmd-v3_30_0.xsd
index 214b88b..853841a 100644
--- a/v3_30_0/CDT-mgmtCmd-v3_30_0.xsd
+++ b/v3_30_0/CDT-mgmtCmd-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-multimediaSession-v3_30_0.xsd b/v3_30_0/CDT-multimediaSession-v3_30_0.xsd
index f59be93..0310dc3 100644
--- a/v3_30_0/CDT-multimediaSession-v3_30_0.xsd
+++ b/v3_30_0/CDT-multimediaSession-v3_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-node-v3_30_0.xsd b/v3_30_0/CDT-node-v3_30_0.xsd
index b045766..ef702a9 100644
--- a/v3_30_0/CDT-node-v3_30_0.xsd
+++ b/v3_30_0/CDT-node-v3_30_0.xsd
@@ -27,23 +27,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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
-	<xs:include schemaLocation="CDT-schedule-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-schedule-v3_30_0.xsd"/>
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-notification-v3_30_0.xsd b/v3_30_0/CDT-notification-v3_30_0.xsd
index a65b49b..1fc4eb5 100644
--- a/v3_30_0/CDT-notification-v3_30_0.xsd
+++ b/v3_30_0/CDT-notification-v3_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-v3_29_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_29_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_30_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_30_0/CDT-notificationTargetMgmtPolicyRef-v3_30_0.xsd b/v3_30_0/CDT-notificationTargetMgmtPolicyRef-v3_30_0.xsd
index dcb5109..c81b83e 100644
--- a/v3_30_0/CDT-notificationTargetMgmtPolicyRef-v3_30_0.xsd
+++ b/v3_30_0/CDT-notificationTargetMgmtPolicyRef-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-notificationTargetPolicy-v3_30_0.xsd b/v3_30_0/CDT-notificationTargetPolicy-v3_30_0.xsd
index b3227d0..39618f6 100644
--- a/v3_30_0/CDT-notificationTargetPolicy-v3_30_0.xsd
+++ b/v3_30_0/CDT-notificationTargetPolicy-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-ontology-v3_30_0.xsd b/v3_30_0/CDT-ontology-v3_30_0.xsd
index 1f9b04f..30922b4 100644
--- a/v3_30_0/CDT-ontology-v3_30_0.xsd
+++ b/v3_30_0/CDT-ontology-v3_30_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_30_0/CDT-ontologyRepository-v3_30_0.xsd b/v3_30_0/CDT-ontologyRepository-v3_30_0.xsd
index 4cc777c..caa8377 100644
--- a/v3_30_0/CDT-ontologyRepository-v3_30_0.xsd
+++ b/v3_30_0/CDT-ontologyRepository-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_30_0/CDT-policyDeletionRules-v3_30_0.xsd b/v3_30_0/CDT-policyDeletionRules-v3_30_0.xsd
index becba34..470cff2 100644
--- a/v3_30_0/CDT-policyDeletionRules-v3_30_0.xsd
+++ b/v3_30_0/CDT-policyDeletionRules-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-pollingChannel-v3_30_0.xsd b/v3_30_0/CDT-pollingChannel-v3_30_0.xsd
index 3a72daf..63336d7 100644
--- a/v3_30_0/CDT-pollingChannel-v3_30_0.xsd
+++ b/v3_30_0/CDT-pollingChannel-v3_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-reboot-v3_30_0.xsd b/v3_30_0/CDT-reboot-v3_30_0.xsd
index 123331e..a934c08 100644
--- a/v3_30_0/CDT-reboot-v3_30_0.xsd
+++ b/v3_30_0/CDT-reboot-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-remoteCSE-v3_30_0.xsd b/v3_30_0/CDT-remoteCSE-v3_30_0.xsd
index 7582ccd..aa747f8 100644
--- a/v3_30_0/CDT-remoteCSE-v3_30_0.xsd
+++ b/v3_30_0/CDT-remoteCSE-v3_30_0.xsd
@@ -26,22 +26,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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd" />
 						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-request-v3_30_0.xsd b/v3_30_0/CDT-request-v3_30_0.xsd
index e138918..4e206fb 100644
--- a/v3_30_0/CDT-request-v3_30_0.xsd
+++ b/v3_30_0/CDT-request-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-requestPrimitive-v3_30_0.xsd b/v3_30_0/CDT-requestPrimitive-v3_30_0.xsd
index 4b2cb9f..8c365de 100644
--- a/v3_30_0/CDT-requestPrimitive-v3_30_0.xsd
+++ b/v3_30_0/CDT-requestPrimitive-v3_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-v3_29_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_30_0/CDT-responsePrimitive-v3_30_0.xsd b/v3_30_0/CDT-responsePrimitive-v3_30_0.xsd
index 0b56b01..1c4acd6 100644
--- a/v3_30_0/CDT-responsePrimitive-v3_30_0.xsd
+++ b/v3_30_0/CDT-responsePrimitive-v3_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-v3_29_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_29_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_29_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_30_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_30_0/CDT-role-v3_30_0.xsd b/v3_30_0/CDT-role-v3_30_0.xsd
index ed2679c..c86d51e 100644
--- a/v3_30_0/CDT-role-v3_30_0.xsd
+++ b/v3_30_0/CDT-role-v3_30_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-schedule-v3_30_0.xsd b/v3_30_0/CDT-schedule-v3_30_0.xsd
index 46708f0..d26e48b 100644
--- a/v3_30_0/CDT-schedule-v3_30_0.xsd
+++ b/v3_30_0/CDT-schedule-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-semanticDescriptor-v3_30_0.xsd b/v3_30_0/CDT-semanticDescriptor-v3_30_0.xsd
index 4310ecd..77ff30e 100644
--- a/v3_30_0/CDT-semanticDescriptor-v3_30_0.xsd
+++ b/v3_30_0/CDT-semanticDescriptor-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-semanticMashupInstance-v3_30_0.xsd b/v3_30_0/CDT-semanticMashupInstance-v3_30_0.xsd
index 69874eb..934c63e 100644
--- a/v3_30_0/CDT-semanticMashupInstance-v3_30_0.xsd
+++ b/v3_30_0/CDT-semanticMashupInstance-v3_30_0.xsd
@@ -26,11 +26,11 @@ 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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-semanticMashupJobProfile-v3_30_0.xsd b/v3_30_0/CDT-semanticMashupJobProfile-v3_30_0.xsd
index b76a2c7..a44666d 100644
--- a/v3_30_0/CDT-semanticMashupJobProfile-v3_30_0.xsd
+++ b/v3_30_0/CDT-semanticMashupJobProfile-v3_30_0.xsd
@@ -26,11 +26,11 @@ 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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-semanticMashupResult-v3_30_0.xsd b/v3_30_0/CDT-semanticMashupResult-v3_30_0.xsd
index d32a0e3..8f8da69 100644
--- a/v3_30_0/CDT-semanticMashupResult-v3_30_0.xsd
+++ b/v3_30_0/CDT-semanticMashupResult-v3_30_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-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-serviceSubscribedAppRule-v3_30_0.xsd b/v3_30_0/CDT-serviceSubscribedAppRule-v3_30_0.xsd
index 0fe1342..cc612f1 100644
--- a/v3_30_0/CDT-serviceSubscribedAppRule-v3_30_0.xsd
+++ b/v3_30_0/CDT-serviceSubscribedAppRule-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-serviceSubscribedNode-v3_30_0.xsd b/v3_30_0/CDT-serviceSubscribedNode-v3_30_0.xsd
index a0986fe..cddc370 100644
--- a/v3_30_0/CDT-serviceSubscribedNode-v3_30_0.xsd
+++ b/v3_30_0/CDT-serviceSubscribedNode-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-software-v3_30_0.xsd b/v3_30_0/CDT-software-v3_30_0.xsd
index a34b9fe..cb78941 100644
--- a/v3_30_0/CDT-software-v3_30_0.xsd
+++ b/v3_30_0/CDT-software-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-statsCollect-v3_30_0.xsd b/v3_30_0/CDT-statsCollect-v3_30_0.xsd
index 6276313..7662aad 100644
--- a/v3_30_0/CDT-statsCollect-v3_30_0.xsd
+++ b/v3_30_0/CDT-statsCollect-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-statsConfig-v3_30_0.xsd b/v3_30_0/CDT-statsConfig-v3_30_0.xsd
index d259198..d463ad9 100644
--- a/v3_30_0/CDT-statsConfig-v3_30_0.xsd
+++ b/v3_30_0/CDT-statsConfig-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-subscription-v3_30_0.xsd b/v3_30_0/CDT-subscription-v3_30_0.xsd
index 2a4e456..204f260 100644
--- a/v3_30_0/CDT-subscription-v3_30_0.xsd
+++ b/v3_30_0/CDT-subscription-v3_30_0.xsd
@@ -27,10 +27,10 @@ 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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-svcFwWrapper-v3_30_0.xsd b/v3_30_0/CDT-svcFwWrapper-v3_30_0.xsd
index 845c1ea..0a72457 100644
--- a/v3_30_0/CDT-svcFwWrapper-v3_30_0.xsd
+++ b/v3_30_0/CDT-svcFwWrapper-v3_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-v3_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-svcObjWrapper-v3_30_0.xsd b/v3_30_0/CDT-svcObjWrapper-v3_30_0.xsd
index d8c4834..1e50398 100644
--- a/v3_30_0/CDT-svcObjWrapper-v3_30_0.xsd
+++ b/v3_30_0/CDT-svcObjWrapper-v3_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-v3_29_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_30_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-timeSeries-v3_30_0.xsd b/v3_30_0/CDT-timeSeries-v3_30_0.xsd
index 50a97f7..bceb312 100644
--- a/v3_30_0/CDT-timeSeries-v3_30_0.xsd
+++ b/v3_30_0/CDT-timeSeries-v3_30_0.xsd
@@ -26,11 +26,11 @@ 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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_30_0/CDT-timeSeriesInstance-v3_30_0.xsd b/v3_30_0/CDT-timeSeriesInstance-v3_30_0.xsd
index 08cf62c..9a22c80 100644
--- a/v3_30_0/CDT-timeSeriesInstance-v3_30_0.xsd
+++ b/v3_30_0/CDT-timeSeriesInstance-v3_30_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd"/>
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-timeSeriesNotification-v3_30_0.xsd b/v3_30_0/CDT-timeSeriesNotification-v3_30_0.xsd
index 84a3996..6d2b667 100644
--- a/v3_30_0/CDT-timeSeriesNotification-v3_30_0.xsd
+++ b/v3_30_0/CDT-timeSeriesNotification-v3_30_0.xsd
@@ -27,7 +27,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" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
 	
 	<xs:element name="timeSeriesNotification">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-token-v3_30_0.xsd b/v3_30_0/CDT-token-v3_30_0.xsd
index 475ca46..24aff94 100644
--- a/v3_30_0/CDT-token-v3_30_0.xsd
+++ b/v3_30_0/CDT-token-v3_30_0.xsd
@@ -27,9 +27,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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 	
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_30_0/CDT-transaction-v3_30_0.xsd b/v3_30_0/CDT-transaction-v3_30_0.xsd
index 59496b9..3803232 100644
--- a/v3_30_0/CDT-transaction-v3_30_0.xsd
+++ b/v3_30_0/CDT-transaction-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_30_0.xsd" />
 
 	<xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-transactionMgmt-v3_30_0.xsd b/v3_30_0/CDT-transactionMgmt-v3_30_0.xsd
index adc49fc..23e6665 100644
--- a/v3_30_0/CDT-transactionMgmt-v3_30_0.xsd
+++ b/v3_30_0/CDT-transactionMgmt-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_30_0.xsd" />
 
 	<xs:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-triggerPayload-v3_30_0.xsd b/v3_30_0/CDT-triggerPayload-v3_30_0.xsd
index 934b74e..fcb00d4 100644
--- a/v3_30_0/CDT-triggerPayload-v3_30_0.xsd
+++ b/v3_30_0/CDT-triggerPayload-v3_30_0.xsd
@@ -27,7 +27,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" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
 	
 	<xs:element name="triggerPayload">
 		<xs:complexType>
diff --git a/v3_30_0/CDT-triggerRequest-v3_30_0.xsd b/v3_30_0/CDT-triggerRequest-v3_30_0.xsd
index 93b08d6..8950a4d 100644
--- a/v3_30_0/CDT-triggerRequest-v3_30_0.xsd
+++ b/v3_30_0/CDT-triggerRequest-v3_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-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_29_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_29_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
 
 	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
-- 
GitLab