diff --git a/v3_30_0/CDT-AE-v3_30_0.xsd b/v3_30_0/CDT-AE-v3_30_0.xsd
index ffe7db6ac34f3e699c85b0c4d6202fb6375a8257..14679a827f25e6bc7bed078e09a67147677fdb80 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_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: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: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 33e5f65676bbc8861ddcda661f6781d6856db982..cacb2276ccd01b79507226da28e0586b4338deca 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_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: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: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 3f5ab074b03f841babd072c777b77140a5fa9382..6a768679e3c348afdf0dd2dfcb9e86ba8fd08040 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_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_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 06b148a5bb193e82ee53cd0e4c4c74b20754b620..4b7537b960640eff3961b2b83d00d60991db450a 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_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: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: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 4a726a5c642a50452ba971fececef877e6f8a8f4..46f16bd79ee0209a68113a7333683aaabb88449f 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_30_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd"/>
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 d2610ea379008d8e75878c73cca29afa2f2dc412..f01c09d555265285ac9e0560a13e94fbbdab4131 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_30_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_29_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 1297667c88eb7092025dc91412cacb72f86dc824..faa55d5bf9dc45c91ff6ca4f93e279708f6eb729 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_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: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: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 2b891a60c858b7f2122ed2e527509647bb1422f5..9c551fce660d4ebecd6088350e2dc6a979034a80 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_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: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: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 7e71bedfa1573ce38651609ead870f380b895f2f..c80aaa197e9353815ea8e94771e5f19276bcb6a6 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_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: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: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 b27879087353aac434b0175c198ba933080c938e..db0fa28d37b53a20d82a3d3acf744e78ff6dbba6 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_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-commonTypes-v3_29_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 f99c69651d6766636f2d98c694f7e15c0e19685f..f2b83c4d0fdfe776a28bad7a900928a6e2751168 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_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-commonTypes-v3_29_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 72f30ad9ab0420d56a8d3c448ea7dac4bfd2b97a..5641e467e530af96a44d3ee062326960f75d24ff 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_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: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: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 48b3eb275362f16bccfbfe061b1c812ebad37e72..75d0dd4222001bdbd4971a6546ca5829fc4022db 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 34915cef275eb1978dc33e3bba49350efbd74920..89c6d2ee218f07420b4efb6aa4eb3185365f821b 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 d3be91895f0549762d55d534e871559a7991ebf6..1756a18d28a43c622d9423d60337787c05db3e84 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 93f323f20f4ebb1fada86f589cfc8e0c70e7e8b8..7c7b55e40b6ae422a4f1e74426c7054cb15bc563 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_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: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: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 8fca61cc18d0e879bd454896a5bfda679b55f80c..fe3b66d603d699603859568700f55c8c168e7c67 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 86b47c4674a4cf03b98c56942c89e5be0d8bd959..97f8558d47b05b58693d59789966cc9c95bcf443 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 67cf984b9633be4300129867b22fe0415acf00df..8f6899058ceb37bc27a1f49055a2172216f77fac 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 16bb0de17e38fad19c3de44f5584f00229e61a03..3c9f1fb20fac25aebabe3be770b0a884945ae439 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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_29_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 d1c7406249a308d8abee1e3652d16f524c56bb74..615bcc3b88867d60a9a006fc360ed280dde760fd 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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_29_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 c6b7053e05e42002e91b16a7851c8c3595547268..29c9eddaa2fc651bbcf1206ad273caba4545e205 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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_29_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 d1da40d80b83c385f5865ba56075b91c37b0dc6d..423b359710df33de72c9edab2cca07dcce4c405d 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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_29_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 7f983fcec66acae5c15acc1ac8431c2c611ac48e..9f011a60701fc1babaae935079144176327bfb0d 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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_29_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 c962d92dd156ecb8b94b6beecb8e19b7a7b9be40..b143238b617af3e4b1244415dfdb56bf653bcbfd 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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_29_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 7c2ebef1cf8a9eb4233117557e8c465cd98deecf..4e27adcc79a742ca94f7bb27c832f985263abf40 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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_29_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 0c084b8f2b8104fea75e3388413506fe4a4e8773..69d4fbc880639747340907cb737ae9de0e1aee6c 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_30_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_29_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 5ee276788c1f7b28ec5639062286c9e79d63b245..5a44fb8f9ab78aa3fdb7bc77a356442fedd10774 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_30_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_29_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 41c4ac17c76ae70f723bf3bf75885ee2ff4aec4b..f96b2f35eb0ceaf79bc807054e6b3b2a6110beab 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_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: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: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 22387000aa9efe027b17f2e003bbff536b72f771..cfcc27d9fef871fa3e69e01db8deb24e0d9c52c7 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_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-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_29_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 b7a1c6325100fe925beda0f3fd991e2299802cad..78834e31a972ed3cf61bfb6adf06dcd8c7de745a 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_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: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: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 2fc302ca3870db47eb1a24ca919eb30cba2dc3ea..e17fa8580cb63a4b1cf148702949b9be7d86ae79 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 d82bc23b9e7c56ece1a1de7e60541611823a6aaa..22973385ea83199ac6208020956bc42d37cb3a0b 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 98ad8c80702dc35fb751710e63e1768361297629..0fa65b56b24ddd2ad2298bb5f2685248cd11b01a 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 4c59aa8aac5aee368d46e7d0eddc546a17c79a72..d88b4867f5ba3a4db13e4d397bb94f84d08966a3 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 cfc7a060bf01dae33e71fc5b382b4706e5f47c90..47aa08290d46454327290a54a7eedb2388259985 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 44c38d97e9ccc9d167fffae041862389bb521711..d7a9bfe014bbf65877751fb05e0c3ac8a2a5703b 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 29af342e72ae16c4920c32a2f1821fab9e77d938..c2e6b72cb0d52fad231fdef056f3c60a69cc2737 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 52ce98892379089b6c51912769acf3299122cb0c..795e586fab68a8d00a74c0b02bf1acf9f02b0d00 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 ae0a09857bd837db8e41f552560a49c7fe8d83ea..bd30a140477d25fd4c645fb026d28752a733db44 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_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-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: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 62c697da092c57ceb3bab0c4712789241494ae6e..6c9ea4bd603c4e662150ce97575d6e125b8d58cd 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_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_30_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_29_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 71f9d91f2a608fb01cbb0da57e9b8d29a6a95225..a9a09c6ddce80a5bb05f9090f23e56291e79d140 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 d3bef09768d85794d5d309d2347634871ee36b18..ad52865ffdb18db0e22fd55d0614828c65d8ee48 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_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: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: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 bd75c9e6765a4357660466da1f24a23f678edb4b..9b698761aca34a78b49053f6cb8e79ef3767aa9e 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 e1b5dd9a30438ecfd94728f93ad7d05acfe86abc..7537e33749759e161b9de072b94e877b4a4eaf0b 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_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: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: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 0310dc3393763daa6e74b53fb4e23edc1517f783..f59be93eac9344556ffbce6b5a5e5890d471cdb3 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 ef702a9434d879a61794fb6a99d2d3c26b207165..b045766cc72b38e4d8e3821dbf10435233769391 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_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: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: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 233d3c3df24d785a548d431ec3bcdd0f2c67cb01..3fc5f15a02a42c02d267dc8523e252f16dec300c 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_30_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_30_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_29_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 c81b83e7f2df55aff8b62b090deb15790acbb5f6..dcb51091771cedb6ecbd76a90c0ada06e7538b3f 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 39618f65c2cf6394e1a4b35c34929fa0f6a4aa30..b3227d078cf7847bf60bc4859d8e4937abdd4dc0 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_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: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: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 30922b4a21aa7dbab1ac9692e48b07106e57d039..1f9b04f8d341674f9f360f7eaab80a8be70f5b15 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 caa8377798fb591ed5677e4eff74b3c621081f5e..4cc777cb2a8456911f5ac69c0ce0f0f864bbde59 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_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: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: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 470cff25961ef3ad703e565e96f07ede3f683952..becba343e2359e316455008a971abcd2beaf85d0 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 63336d76987286fafc91a67d8c4f94bb7445e511..3a72daf53e42b9c145ea52aadd8eca20482490a5 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 a934c08073f684064400b5b2fc44c10e1768e303..123331e6d8bb48317918c836c8263bdeff2ffafd 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 aa747f80a8aaf81fdc1083524e969b9b4f4768fb..7582ccd3cf4abe2635bcc5567197501d6d44a8b3 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_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: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: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 4e206fbaa3960f31f941225fcd9d8a583b880ce1..e1389185cd8ab7eb55f74bd73448ea769664cb85 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 8c365de2c82efd1b1127eb16884e86435ce5e73d..4b2cb9fe1bbd481707ddd705f22803f28e6f33ca 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_30_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_29_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 1c4acd60b12fa8786789923215375d5853f79fb5..0b56b01386f6a8dc8f96354212f8e48772942882 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_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: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: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 c86d51e009e86da5490a35111866183c83ae72a1..ed2679c5f645f35e983d8c02d353cc8e2a0dd7ff 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 d26e48bbc030805e7273a4970febb1f83b384c82..46708f0c485f51da9a99549e782a5114444ebc58 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 77ff30e4f351b5664ce34ccd5aca07a86430960a..4310ecd139ac0d85a15fba8a8df3cc882b7d2b67 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 934c63e5b79cfc43d18ed454e15f8c8c3481718c..69874ebd3d4d06ccc263e75f49e755019aa1e582 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_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: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: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 a44666d5305678a0b94a610e95213cecfceb7953..b76a2c7d6fe536996901bbb4fa27d258085fa0cc 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_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: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: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 8f8da6989206f0310c6f37f1f671beec419bced5..d32a0e38c2c1ff3ddc24a6e61abf5e2fff132863 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_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-subscription-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_29_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 cc612f1dc3360a9947c1307e9ac15e81eb304fd2..0fe13426e8e6863b4b2d2f55cbc88009424a402b 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 cddc37013b7a3bcff201a8d93eeb45d22f15abc0..a0986fe707dc0f92f9b171dcac92f7b81387f638 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 cb789415b52a1f09424230de3485500b3057d546..a34b9fe388bcc60b5e2ba77c9c3cb6bb1fbd7fea 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 7662aad7acebe714744be32fbd6ad87e063b4935..6276313ea67a364972817f8f6c202bdd94fde7f1 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 d463ad9165c7aba3326f244c237e121878171961..d25919890e60bcbb5302832cf3df69592871602f 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_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: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: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 204f260ea1afc66c1475ccac73c12667d7935949..2a4e4563f3f7ae1c410f43ad437d440a1a2d10bb 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_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: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: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 0a724578b1466edfee99fb3b5a7c9b61470e5d97..845c1ea07b5fb88904fe561de8d792dd8835b183 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_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-commonTypes-v3_29_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_29_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_29_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 1e5039865d10c4c3017b2e35657e4a3f80b3ae1f..d8c4834aec405e53658ef021e2ff5f3694493f55 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_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: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: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 bceb31258ea49849955aa3f45d654e0fc8fa3be8..50a97f7255ac1649e7c50a66900b1c7325b9d115 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_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: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: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 9a22c80d1bc0a8e582ca89cded3611c49f1612ec..08cf62c7e49ac22b5dcd051fedf8462337073fc5 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd"/>
+	<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: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 6d2b66797480d2d8b9923c1968413a441661538d..84a399678af944f65caed4e0e6ad909943a4e41f 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_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_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 24aff94f263bfd3145a7783d69a8bac0b12dfef4..475ca468b1dd32916db4dd74a2b9f970310f3f9d 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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: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 38032320d1d632b02cb6ac87c599a5ff675ec7b8..59496b961c3d353c3665dc157562e72b7c3ce028 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_30_0.xsd" />
+	<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: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 23e6665e71d03485f97d9f80372157f8e14100ef..adc49fc43e68e0bd24c795c03645afc20ae5801f 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_30_0.xsd" />
+	<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: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 fcb00d40a85f7f7511baf8073b7aa13b67bb6034..934b74eb61c2420b8858653f3dfe7cc71d8afaa7 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_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_29_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 8950a4ded6cbe30f9f137a4b1f7c8b06c17b92b3..93b08d6b723793a29697afae5a5963ca75f42f06 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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<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:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>