diff --git a/v3_31_0/CDT-AE-v3_31_0.xsd b/v3_31_0/CDT-AE-v3_31_0.xsd
index ffe7db6ac34f3e699c85b0c4d6202fb6375a8257..031f26a245e057987a78b54d936a565f94f97efd 100644
--- a/v3_31_0/CDT-AE-v3_31_0.xsd
+++ b/v3_31_0/CDT-AE-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-triggerRequest-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-AEContactList-v3_31_0.xsd b/v3_31_0/CDT-AEContactList-v3_31_0.xsd
index 33e5f65676bbc8861ddcda661f6781d6856db982..6ec583bc4941a77f7fe1855738292f9265b57366 100644
--- a/v3_31_0/CDT-AEContactList-v3_31_0.xsd
+++ b/v3_31_0/CDT-AEContactList-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-AEContactListPerCSE-v3_31_0.xsd b/v3_31_0/CDT-AEContactListPerCSE-v3_31_0.xsd
index 3f5ab074b03f841babd072c777b77140a5fa9382..c4c467c73d5372b02b00a7c2b9e7372a47df053f 100644
--- a/v3_31_0/CDT-AEContactListPerCSE-v3_31_0.xsd
+++ b/v3_31_0/CDT-AEContactListPerCSE-v3_31_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_31_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-CSEBase-v3_31_0.xsd b/v3_31_0/CDT-CSEBase-v3_31_0.xsd
index 06b148a5bb193e82ee53cd0e4c4c74b20754b620..23d4077ea201a18803f69ea21e56dc5b9cfda214 100644
--- a/v3_31_0/CDT-CSEBase-v3_31_0.xsd
+++ b/v3_31_0/CDT-CSEBase-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_31_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_31_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-transactionMgmt-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-transaction-v3_31_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-accessControlPolicy-v3_31_0.xsd b/v3_31_0/CDT-accessControlPolicy-v3_31_0.xsd
index 4a726a5c642a50452ba971fececef877e6f8a8f4..f7f5301a51976f937b844d9ab287e9f19ef8d1e8 100644
--- a/v3_31_0/CDT-accessControlPolicy-v3_31_0.xsd
+++ b/v3_31_0/CDT-accessControlPolicy-v3_31_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_31_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd"/>
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-activeCmdhPolicy-v3_31_0.xsd b/v3_31_0/CDT-activeCmdhPolicy-v3_31_0.xsd
index d2610ea379008d8e75878c73cca29afa2f2dc412..0eb73cb6be0cf680f2a514193dd2ba49b3f650fe 100644
--- a/v3_31_0/CDT-activeCmdhPolicy-v3_31_0.xsd
+++ b/v3_31_0/CDT-activeCmdhPolicy-v3_31_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_31_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_31_0/CDT-allJoynApp-v3_31_0.xsd b/v3_31_0/CDT-allJoynApp-v3_31_0.xsd
index 1297667c88eb7092025dc91412cacb72f86dc824..7b681ff41c681bebdd7338f75b17ac9825c49335 100644
--- a/v3_31_0/CDT-allJoynApp-v3_31_0.xsd
+++ b/v3_31_0/CDT-allJoynApp-v3_31_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_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_31_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-allJoynInterface-v3_31_0.xsd b/v3_31_0/CDT-allJoynInterface-v3_31_0.xsd
index 2b891a60c858b7f2122ed2e527509647bb1422f5..d4cfee97cbbf456f2ee63ea47a72fccf9d3c4e96 100644
--- a/v3_31_0/CDT-allJoynInterface-v3_31_0.xsd
+++ b/v3_31_0/CDT-allJoynInterface-v3_31_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_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_31_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_31_0/CDT-allJoynMethod-v3_31_0.xsd b/v3_31_0/CDT-allJoynMethod-v3_31_0.xsd
index 7e71bedfa1573ce38651609ead870f380b895f2f..e57e64cd1a6b959d014ba16b0110158881f630c2 100644
--- a/v3_31_0/CDT-allJoynMethod-v3_31_0.xsd
+++ b/v3_31_0/CDT-allJoynMethod-v3_31_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_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_31_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_31_0/CDT-allJoynMethodCall-v3_31_0.xsd b/v3_31_0/CDT-allJoynMethodCall-v3_31_0.xsd
index b27879087353aac434b0175c198ba933080c938e..6ef60030e0806a6879ce9b128da1757e80e461f0 100644
--- a/v3_31_0/CDT-allJoynMethodCall-v3_31_0.xsd
+++ b/v3_31_0/CDT-allJoynMethodCall-v3_31_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_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-allJoynProperty-v3_31_0.xsd b/v3_31_0/CDT-allJoynProperty-v3_31_0.xsd
index f99c69651d6766636f2d98c694f7e15c0e19685f..ab22570479a966ab1d4b1b1650b752590ca5af57 100644
--- a/v3_31_0/CDT-allJoynProperty-v3_31_0.xsd
+++ b/v3_31_0/CDT-allJoynProperty-v3_31_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_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-allJoynSvcObject-v3_31_0.xsd b/v3_31_0/CDT-allJoynSvcObject-v3_31_0.xsd
index 72f30ad9ab0420d56a8d3c448ea7dac4bfd2b97a..3fa7933cea634a23987940b849ec25d059652147 100644
--- a/v3_31_0/CDT-allJoynSvcObject-v3_31_0.xsd
+++ b/v3_31_0/CDT-allJoynSvcObject-v3_31_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_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_31_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-areaNwkDeviceInfo-v3_31_0.xsd b/v3_31_0/CDT-areaNwkDeviceInfo-v3_31_0.xsd
index 48b3eb275362f16bccfbfe061b1c812ebad37e72..a64dac2d6a6dade8c08aa03a56107b672ce2dc0b 100644
--- a/v3_31_0/CDT-areaNwkDeviceInfo-v3_31_0.xsd
+++ b/v3_31_0/CDT-areaNwkDeviceInfo-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-areaNwkInfo-v3_31_0.xsd b/v3_31_0/CDT-areaNwkInfo-v3_31_0.xsd
index 34915cef275eb1978dc33e3bba49350efbd74920..29bd8a2469213eef62c35f3662cfc157cf18fc4e 100644
--- a/v3_31_0/CDT-areaNwkInfo-v3_31_0.xsd
+++ b/v3_31_0/CDT-areaNwkInfo-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-authorizationDecision-v3_31_0.xsd b/v3_31_0/CDT-authorizationDecision-v3_31_0.xsd
index d3be91895f0549762d55d534e871559a7991ebf6..63e286a2984734ea23f77c3a648d1cf74b656178 100644
--- a/v3_31_0/CDT-authorizationDecision-v3_31_0.xsd
+++ b/v3_31_0/CDT-authorizationDecision-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-authorizationInformation-v3_31_0.xsd b/v3_31_0/CDT-authorizationInformation-v3_31_0.xsd
index 93f323f20f4ebb1fada86f589cfc8e0c70e7e8b8..4391ffebfc92508d9f8c15d2aed62ebcd267ef7d 100644
--- a/v3_31_0/CDT-authorizationInformation-v3_31_0.xsd
+++ b/v3_31_0/CDT-authorizationInformation-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-authorizationPolicy-v3_31_0.xsd b/v3_31_0/CDT-authorizationPolicy-v3_31_0.xsd
index 8fca61cc18d0e879bd454896a5bfda679b55f80c..21beb814a7dc7c9ef4ea1b00666e45ac5d43aefe 100644
--- a/v3_31_0/CDT-authorizationPolicy-v3_31_0.xsd
+++ b/v3_31_0/CDT-authorizationPolicy-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-backgroundDataTransfer-v3_31_0.xsd b/v3_31_0/CDT-backgroundDataTransfer-v3_31_0.xsd
index 86b47c4674a4cf03b98c56942c89e5be0d8bd959..fdfe77e3425ecb1ae3a065d86dcb91b5edd86031 100644
--- a/v3_31_0/CDT-backgroundDataTransfer-v3_31_0.xsd
+++ b/v3_31_0/CDT-backgroundDataTransfer-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 
 	<xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-battery-v3_31_0.xsd b/v3_31_0/CDT-battery-v3_31_0.xsd
index 67cf984b9633be4300129867b22fe0415acf00df..f0e6b20af2c3dfd3049b51402b268305b8957617 100644
--- a/v3_31_0/CDT-battery-v3_31_0.xsd
+++ b/v3_31_0/CDT-battery-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-cmdhBuffer-v3_31_0.xsd b/v3_31_0/CDT-cmdhBuffer-v3_31_0.xsd
index 16bb0de17e38fad19c3de44f5584f00229e61a03..b97b5409658505a887158ebf55e3f248ecd518a8 100644
--- a/v3_31_0/CDT-cmdhBuffer-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhBuffer-v3_31_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_31_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_31_0/CDT-cmdhDefEcValue-v3_31_0.xsd b/v3_31_0/CDT-cmdhDefEcValue-v3_31_0.xsd
index d1c7406249a308d8abee1e3652d16f524c56bb74..743299c6e194973cf195ed3821843936c1ec4142 100644
--- a/v3_31_0/CDT-cmdhDefEcValue-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhDefEcValue-v3_31_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_31_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_31_0/CDT-cmdhDefaults-v3_31_0.xsd b/v3_31_0/CDT-cmdhDefaults-v3_31_0.xsd
index c6b7053e05e42002e91b16a7851c8c3595547268..8c5438af81c2a0f793bcb7ad9ea6264a95c61153 100644
--- a/v3_31_0/CDT-cmdhDefaults-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhDefaults-v3_31_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_31_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_31_0/CDT-cmdhEcDefParamValues-v3_31_0.xsd b/v3_31_0/CDT-cmdhEcDefParamValues-v3_31_0.xsd
index d1da40d80b83c385f5865ba56075b91c37b0dc6d..143a0f6cee5a1cb4b46d598924d6ba526166de4b 100644
--- a/v3_31_0/CDT-cmdhEcDefParamValues-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhEcDefParamValues-v3_31_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_31_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_31_0/CDT-cmdhLimits-v3_31_0.xsd b/v3_31_0/CDT-cmdhLimits-v3_31_0.xsd
index 7f983fcec66acae5c15acc1ac8431c2c611ac48e..c16c75770d907630e1e0e4642ee1d1630edc09d0 100644
--- a/v3_31_0/CDT-cmdhLimits-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhLimits-v3_31_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_31_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_31_0/CDT-cmdhNetworkAccessRules-v3_31_0.xsd b/v3_31_0/CDT-cmdhNetworkAccessRules-v3_31_0.xsd
index c962d92dd156ecb8b94b6beecb8e19b7a7b9be40..10b39baebda777ce608805b6baaaebf70f38a562 100644
--- a/v3_31_0/CDT-cmdhNetworkAccessRules-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhNetworkAccessRules-v3_31_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_31_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_31_0/CDT-cmdhNwAccessRule-v3_31_0.xsd b/v3_31_0/CDT-cmdhNwAccessRule-v3_31_0.xsd
index 7c2ebef1cf8a9eb4233117557e8c465cd98deecf..4283e9b37472ae70262b4f95ed0a22c4c2ad3107 100644
--- a/v3_31_0/CDT-cmdhNwAccessRule-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhNwAccessRule-v3_31_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_31_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_31_0/CDT-cmdhPolicy-v3_31_0.xsd b/v3_31_0/CDT-cmdhPolicy-v3_31_0.xsd
index 0c084b8f2b8104fea75e3388413506fe4a4e8773..efbdf44b28b4dc07aac29b01c2dddd95969c78f4 100644
--- a/v3_31_0/CDT-cmdhPolicy-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhPolicy-v3_31_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_31_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_31_0/CDT-commonTypes-v3_31_0.xsd b/v3_31_0/CDT-commonTypes-v3_31_0.xsd
index 5ee276788c1f7b28ec5639062286c9e79d63b245..c4bc6e6e4203faccbf7d8a8274d3b450e082b9cc 100644
--- a/v3_31_0/CDT-commonTypes-v3_31_0.xsd
+++ b/v3_31_0/CDT-commonTypes-v3_31_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_31_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_31_0/CDT-container-v3_31_0.xsd b/v3_31_0/CDT-container-v3_31_0.xsd
index 41c4ac17c76ae70f723bf3bf75885ee2ff4aec4b..4617ca3c464625004978a032df410e17ce5fb90d 100644
--- a/v3_31_0/CDT-container-v3_31_0.xsd
+++ b/v3_31_0/CDT-container-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_31_0/CDT-contentInstance-v3_31_0.xsd b/v3_31_0/CDT-contentInstance-v3_31_0.xsd
index 22387000aa9efe027b17f2e003bbff536b72f771..a03f051ec07a244361700822f2a32af5a0b2cde8 100644
--- a/v3_31_0/CDT-contentInstance-v3_31_0.xsd
+++ b/v3_31_0/CDT-contentInstance-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-crossResourceSubscription-v3_31_0.xsd b/v3_31_0/CDT-crossResourceSubscription-v3_31_0.xsd
index b7a1c6325100fe925beda0f3fd991e2299802cad..4d41e69578b1868c91d1f045f64f693aa23d7d68 100644
--- a/v3_31_0/CDT-crossResourceSubscription-v3_31_0.xsd
+++ b/v3_31_0/CDT-crossResourceSubscription-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-delivery-v3_31_0.xsd b/v3_31_0/CDT-delivery-v3_31_0.xsd
index 2fc302ca3870db47eb1a24ca919eb30cba2dc3ea..2939ce65aae5c67176094fd92e5e1dbde201993e 100644
--- a/v3_31_0/CDT-delivery-v3_31_0.xsd
+++ b/v3_31_0/CDT-delivery-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_31_0/CDT-deviceCapability-v3_31_0.xsd b/v3_31_0/CDT-deviceCapability-v3_31_0.xsd
index d82bc23b9e7c56ece1a1de7e60541611823a6aaa..3f4a4f97f840491167b918f02be5bd998c1d9830 100644
--- a/v3_31_0/CDT-deviceCapability-v3_31_0.xsd
+++ b/v3_31_0/CDT-deviceCapability-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-deviceInfo-v3_31_0.xsd b/v3_31_0/CDT-deviceInfo-v3_31_0.xsd
index 98ad8c80702dc35fb751710e63e1768361297629..f966c1842ef75a966c0f0c88e43c018bf1327dc6 100644
--- a/v3_31_0/CDT-deviceInfo-v3_31_0.xsd
+++ b/v3_31_0/CDT-deviceInfo-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-dynamicAuthorizationConsultation-v3_31_0.xsd b/v3_31_0/CDT-dynamicAuthorizationConsultation-v3_31_0.xsd
index 4c59aa8aac5aee368d46e7d0eddc546a17c79a72..31e8de141dfbea023729ad7798c58b588eb346f6 100644
--- a/v3_31_0/CDT-dynamicAuthorizationConsultation-v3_31_0.xsd
+++ b/v3_31_0/CDT-dynamicAuthorizationConsultation-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-eventConfig-v3_31_0.xsd b/v3_31_0/CDT-eventConfig-v3_31_0.xsd
index cfc7a060bf01dae33e71fc5b382b4706e5f47c90..7415abcf8f250aa02c74dff46346a276f0ac4897 100644
--- a/v3_31_0/CDT-eventConfig-v3_31_0.xsd
+++ b/v3_31_0/CDT-eventConfig-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-eventLog-v3_31_0.xsd b/v3_31_0/CDT-eventLog-v3_31_0.xsd
index 44c38d97e9ccc9d167fffae041862389bb521711..2d25187564b547f49412c41b5b9d4ea136253bef 100644
--- a/v3_31_0/CDT-eventLog-v3_31_0.xsd
+++ b/v3_31_0/CDT-eventLog-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-execInstance-v3_31_0.xsd b/v3_31_0/CDT-execInstance-v3_31_0.xsd
index 29af342e72ae16c4920c32a2f1821fab9e77d938..7d33544c8bf6cef74d6bc1a76f53629ad48de4d2 100644
--- a/v3_31_0/CDT-execInstance-v3_31_0.xsd
+++ b/v3_31_0/CDT-execInstance-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-firmware-v3_31_0.xsd b/v3_31_0/CDT-firmware-v3_31_0.xsd
index 52ce98892379089b6c51912769acf3299122cb0c..9078e63e0b7b30d7fe1e8097d793ca3f2ec726d7 100644
--- a/v3_31_0/CDT-firmware-v3_31_0.xsd
+++ b/v3_31_0/CDT-firmware-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-group-v3_31_0.xsd b/v3_31_0/CDT-group-v3_31_0.xsd
index ae0a09857bd837db8e41f552560a49c7fe8d83ea..7917ff11fe2283acd3c216675e63154f17fe31a5 100644
--- a/v3_31_0/CDT-group-v3_31_0.xsd
+++ b/v3_31_0/CDT-group-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_31_0/CDT-localMulticastGroup-v3_31_0.xsd b/v3_31_0/CDT-localMulticastGroup-v3_31_0.xsd
index 62c697da092c57ceb3bab0c4712789241494ae6e..2cbfb3bc7d843b5d259c0a4b3d0af11102c53d8d 100644
--- a/v3_31_0/CDT-localMulticastGroup-v3_31_0.xsd
+++ b/v3_31_0/CDT-localMulticastGroup-v3_31_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_31_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_30_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_31_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_31_0/CDT-locationPolicy-v3_31_0.xsd b/v3_31_0/CDT-locationPolicy-v3_31_0.xsd
index 71f9d91f2a608fb01cbb0da57e9b8d29a6a95225..c12f603ad73193e9b365e63dff18c3c2a906c229 100644
--- a/v3_31_0/CDT-locationPolicy-v3_31_0.xsd
+++ b/v3_31_0/CDT-locationPolicy-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-m2mServiceSubscriptionProfile-v3_31_0.xsd b/v3_31_0/CDT-m2mServiceSubscriptionProfile-v3_31_0.xsd
index d3bef09768d85794d5d309d2347634871ee36b18..09f131e9384e8f4371f0eef38b8bcc69157dfd06 100644
--- a/v3_31_0/CDT-m2mServiceSubscriptionProfile-v3_31_0.xsd
+++ b/v3_31_0/CDT-m2mServiceSubscriptionProfile-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-memory-v3_31_0.xsd b/v3_31_0/CDT-memory-v3_31_0.xsd
index bd75c9e6765a4357660466da1f24a23f678edb4b..9af7902813f70031addab1cf9c699f924fd72ba9 100644
--- a/v3_31_0/CDT-memory-v3_31_0.xsd
+++ b/v3_31_0/CDT-memory-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-mgmtCmd-v3_31_0.xsd b/v3_31_0/CDT-mgmtCmd-v3_31_0.xsd
index e1b5dd9a30438ecfd94728f93ad7d05acfe86abc..e34878d0cb3ad28791a06d4764909094c118d3c9 100644
--- a/v3_31_0/CDT-mgmtCmd-v3_31_0.xsd
+++ b/v3_31_0/CDT-mgmtCmd-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-multimediaSession-v3_31_0.xsd b/v3_31_0/CDT-multimediaSession-v3_31_0.xsd
index 0310dc3393763daa6e74b53fb4e23edc1517f783..a61f4fd1bf734f5f31a3c697ed20ef44cff52203 100644
--- a/v3_31_0/CDT-multimediaSession-v3_31_0.xsd
+++ b/v3_31_0/CDT-multimediaSession-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-node-v3_31_0.xsd b/v3_31_0/CDT-node-v3_31_0.xsd
index ef702a9434d879a61794fb6a99d2d3c26b207165..3557a7297ed249fea13b074a47595ca4928e28b1 100644
--- a/v3_31_0/CDT-node-v3_31_0.xsd
+++ b/v3_31_0/CDT-node-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
+	<xs:include schemaLocation="CDT-schedule-v3_31_0.xsd"/>
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-notification-v3_31_0.xsd b/v3_31_0/CDT-notification-v3_31_0.xsd
index 233d3c3df24d785a548d431ec3bcdd0f2c67cb01..14cb10598543d0ec944d86927fe4051d227ec289 100644
--- a/v3_31_0/CDT-notification-v3_31_0.xsd
+++ b/v3_31_0/CDT-notification-v3_31_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_31_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_31_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_31_0/CDT-notificationTargetMgmtPolicyRef-v3_31_0.xsd b/v3_31_0/CDT-notificationTargetMgmtPolicyRef-v3_31_0.xsd
index c81b83e7f2df55aff8b62b090deb15790acbb5f6..8144f4046272c6e3b102befc585b2e1b50635f7b 100644
--- a/v3_31_0/CDT-notificationTargetMgmtPolicyRef-v3_31_0.xsd
+++ b/v3_31_0/CDT-notificationTargetMgmtPolicyRef-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-notificationTargetPolicy-v3_31_0.xsd b/v3_31_0/CDT-notificationTargetPolicy-v3_31_0.xsd
index 39618f65c2cf6394e1a4b35c34929fa0f6a4aa30..0d00ad9c614e8364fc752bcedb4447af062bf547 100644
--- a/v3_31_0/CDT-notificationTargetPolicy-v3_31_0.xsd
+++ b/v3_31_0/CDT-notificationTargetPolicy-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-ontology-v3_31_0.xsd b/v3_31_0/CDT-ontology-v3_31_0.xsd
index 30922b4a21aa7dbab1ac9692e48b07106e57d039..28033249d9e979469f13d68f4a0083af031739e5 100644
--- a/v3_31_0/CDT-ontology-v3_31_0.xsd
+++ b/v3_31_0/CDT-ontology-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_31_0/CDT-ontologyRepository-v3_31_0.xsd b/v3_31_0/CDT-ontologyRepository-v3_31_0.xsd
index caa8377798fb591ed5677e4eff74b3c621081f5e..e5ab9fbc13bc276674ad26c03e00b9b1e1de168c 100644
--- a/v3_31_0/CDT-ontologyRepository-v3_31_0.xsd
+++ b/v3_31_0/CDT-ontologyRepository-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_31_0/CDT-policyDeletionRules-v3_31_0.xsd b/v3_31_0/CDT-policyDeletionRules-v3_31_0.xsd
index 470cff25961ef3ad703e565e96f07ede3f683952..1918d266d4ce46b1ad0425c310d69b10b547fa4d 100644
--- a/v3_31_0/CDT-policyDeletionRules-v3_31_0.xsd
+++ b/v3_31_0/CDT-policyDeletionRules-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-pollingChannel-v3_31_0.xsd b/v3_31_0/CDT-pollingChannel-v3_31_0.xsd
index 63336d76987286fafc91a67d8c4f94bb7445e511..33306def1c4cdd2588e2f4a4e563d524d701d49c 100644
--- a/v3_31_0/CDT-pollingChannel-v3_31_0.xsd
+++ b/v3_31_0/CDT-pollingChannel-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-reboot-v3_31_0.xsd b/v3_31_0/CDT-reboot-v3_31_0.xsd
index a934c08073f684064400b5b2fc44c10e1768e303..ea6f53434d45fe65e595b8f66c292930fc23b216 100644
--- a/v3_31_0/CDT-reboot-v3_31_0.xsd
+++ b/v3_31_0/CDT-reboot-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-remoteCSE-v3_31_0.xsd b/v3_31_0/CDT-remoteCSE-v3_31_0.xsd
index aa747f80a8aaf81fdc1083524e969b9b4f4768fb..25d1a10398da594d6170b05beeb132e1e0c6db40 100644
--- a/v3_31_0/CDT-remoteCSE-v3_31_0.xsd
+++ b/v3_31_0/CDT-remoteCSE-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd" />
 						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-request-v3_31_0.xsd b/v3_31_0/CDT-request-v3_31_0.xsd
index 4e206fbaa3960f31f941225fcd9d8a583b880ce1..4decb379dd1cd393ae746817d98c5a4aa56f0898 100644
--- a/v3_31_0/CDT-request-v3_31_0.xsd
+++ b/v3_31_0/CDT-request-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-requestPrimitive-v3_31_0.xsd b/v3_31_0/CDT-requestPrimitive-v3_31_0.xsd
index 8c365de2c82efd1b1127eb16884e86435ce5e73d..fdf162d53089c7a4cf31a08989465868dcde11ed 100644
--- a/v3_31_0/CDT-requestPrimitive-v3_31_0.xsd
+++ b/v3_31_0/CDT-requestPrimitive-v3_31_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_31_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_31_0/CDT-responsePrimitive-v3_31_0.xsd b/v3_31_0/CDT-responsePrimitive-v3_31_0.xsd
index 1c4acd60b12fa8786789923215375d5853f79fb5..01caf7bcbef0b2e0565f678dd33a2f68b1d5aa42 100644
--- a/v3_31_0/CDT-responsePrimitive-v3_31_0.xsd
+++ b/v3_31_0/CDT-responsePrimitive-v3_31_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_31_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_31_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_31_0/CDT-role-v3_31_0.xsd b/v3_31_0/CDT-role-v3_31_0.xsd
index c86d51e009e86da5490a35111866183c83ae72a1..8bc1f13ec670ef5c78d84ca2542f558a164bfa8d 100644
--- a/v3_31_0/CDT-role-v3_31_0.xsd
+++ b/v3_31_0/CDT-role-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-schedule-v3_31_0.xsd b/v3_31_0/CDT-schedule-v3_31_0.xsd
index d26e48bbc030805e7273a4970febb1f83b384c82..94561130a8a20364dc86ecbd452244b649ddcb99 100644
--- a/v3_31_0/CDT-schedule-v3_31_0.xsd
+++ b/v3_31_0/CDT-schedule-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-semanticDescriptor-v3_31_0.xsd b/v3_31_0/CDT-semanticDescriptor-v3_31_0.xsd
index 77ff30e4f351b5664ce34ccd5aca07a86430960a..722ff70575ae9fab848bd1c660eed508260e8c72 100644
--- a/v3_31_0/CDT-semanticDescriptor-v3_31_0.xsd
+++ b/v3_31_0/CDT-semanticDescriptor-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-semanticMashupInstance-v3_31_0.xsd b/v3_31_0/CDT-semanticMashupInstance-v3_31_0.xsd
index 934c63e5b79cfc43d18ed454e15f8c8c3481718c..594e6898b857cec3eeed4df13228838feecb064f 100644
--- a/v3_31_0/CDT-semanticMashupInstance-v3_31_0.xsd
+++ b/v3_31_0/CDT-semanticMashupInstance-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-semanticMashupJobProfile-v3_31_0.xsd b/v3_31_0/CDT-semanticMashupJobProfile-v3_31_0.xsd
index a44666d5305678a0b94a610e95213cecfceb7953..0aea4c7906769588a060c80ae3db80637fe92176 100644
--- a/v3_31_0/CDT-semanticMashupJobProfile-v3_31_0.xsd
+++ b/v3_31_0/CDT-semanticMashupJobProfile-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-semanticMashupResult-v3_31_0.xsd b/v3_31_0/CDT-semanticMashupResult-v3_31_0.xsd
index 8f8da6989206f0310c6f37f1f671beec419bced5..21764bfd6020dccb8fba575b54c1ebabc3621ebc 100644
--- a/v3_31_0/CDT-semanticMashupResult-v3_31_0.xsd
+++ b/v3_31_0/CDT-semanticMashupResult-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-serviceSubscribedAppRule-v3_31_0.xsd b/v3_31_0/CDT-serviceSubscribedAppRule-v3_31_0.xsd
index cc612f1dc3360a9947c1307e9ac15e81eb304fd2..6aeee498efbca366f837d7461e902b65c35e5d74 100644
--- a/v3_31_0/CDT-serviceSubscribedAppRule-v3_31_0.xsd
+++ b/v3_31_0/CDT-serviceSubscribedAppRule-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-serviceSubscribedNode-v3_31_0.xsd b/v3_31_0/CDT-serviceSubscribedNode-v3_31_0.xsd
index cddc37013b7a3bcff201a8d93eeb45d22f15abc0..02303600005d77f925b507f135cac2042fd38d86 100644
--- a/v3_31_0/CDT-serviceSubscribedNode-v3_31_0.xsd
+++ b/v3_31_0/CDT-serviceSubscribedNode-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-software-v3_31_0.xsd b/v3_31_0/CDT-software-v3_31_0.xsd
index cb789415b52a1f09424230de3485500b3057d546..8b9c88ed7614b0e21b053c6b750b4a282cd353b1 100644
--- a/v3_31_0/CDT-software-v3_31_0.xsd
+++ b/v3_31_0/CDT-software-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-statsCollect-v3_31_0.xsd b/v3_31_0/CDT-statsCollect-v3_31_0.xsd
index 7662aad7acebe714744be32fbd6ad87e063b4935..6426b51a0be5b760601f8ee6c752c885ea2426a1 100644
--- a/v3_31_0/CDT-statsCollect-v3_31_0.xsd
+++ b/v3_31_0/CDT-statsCollect-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-statsConfig-v3_31_0.xsd b/v3_31_0/CDT-statsConfig-v3_31_0.xsd
index d463ad9165c7aba3326f244c237e121878171961..5cf4ffc749c972fbf0afcc27c84353cdfe8f4bfb 100644
--- a/v3_31_0/CDT-statsConfig-v3_31_0.xsd
+++ b/v3_31_0/CDT-statsConfig-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-subscription-v3_31_0.xsd b/v3_31_0/CDT-subscription-v3_31_0.xsd
index 204f260ea1afc66c1475ccac73c12667d7935949..c562bf0a4a245c69ca320022165e2bb351076ee8 100644
--- a/v3_31_0/CDT-subscription-v3_31_0.xsd
+++ b/v3_31_0/CDT-subscription-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-svcFwWrapper-v3_31_0.xsd b/v3_31_0/CDT-svcFwWrapper-v3_31_0.xsd
index 0a724578b1466edfee99fb3b5a7c9b61470e5d97..559ce5ce0f48713c42c3d280ec7088fcafe92666 100644
--- a/v3_31_0/CDT-svcFwWrapper-v3_31_0.xsd
+++ b/v3_31_0/CDT-svcFwWrapper-v3_31_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_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-svcObjWrapper-v3_31_0.xsd b/v3_31_0/CDT-svcObjWrapper-v3_31_0.xsd
index 1e5039865d10c4c3017b2e35657e4a3f80b3ae1f..f24e475bed84fe59c89fcd28982bf9c36719f83b 100644
--- a/v3_31_0/CDT-svcObjWrapper-v3_31_0.xsd
+++ b/v3_31_0/CDT-svcObjWrapper-v3_31_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_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_31_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-timeSeries-v3_31_0.xsd b/v3_31_0/CDT-timeSeries-v3_31_0.xsd
index bceb31258ea49849955aa3f45d654e0fc8fa3be8..e50c59ff40119038d05b0acbf7079bcadf10b420 100644
--- a/v3_31_0/CDT-timeSeries-v3_31_0.xsd
+++ b/v3_31_0/CDT-timeSeries-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_31_0/CDT-timeSeriesInstance-v3_31_0.xsd b/v3_31_0/CDT-timeSeriesInstance-v3_31_0.xsd
index 9a22c80d1bc0a8e582ca89cded3611c49f1612ec..f1dacc48e0cae5a40fa60f7868f818c09edf99d3 100644
--- a/v3_31_0/CDT-timeSeriesInstance-v3_31_0.xsd
+++ b/v3_31_0/CDT-timeSeriesInstance-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd"/>
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-timeSeriesNotification-v3_31_0.xsd b/v3_31_0/CDT-timeSeriesNotification-v3_31_0.xsd
index a2ab9632802d7b0c357b70852fa76c575b4d2a04..756422f6e3229f3f5def3f64397b9ee36713b641 100644
--- a/v3_31_0/CDT-timeSeriesNotification-v3_31_0.xsd
+++ b/v3_31_0/CDT-timeSeriesNotification-v3_31_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_31_0.xsd" />
 	
 	<xs:element name="timeSeriesNotification" type="m2m:timeSeriesNotificationType" />
 
diff --git a/v3_31_0/CDT-token-v3_31_0.xsd b/v3_31_0/CDT-token-v3_31_0.xsd
index 24aff94f263bfd3145a7783d69a8bac0b12dfef4..fa1daf2fcacaff98389297c16235f89e5c272e7d 100644
--- a/v3_31_0/CDT-token-v3_31_0.xsd
+++ b/v3_31_0/CDT-token-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_31_0/CDT-transaction-v3_31_0.xsd b/v3_31_0/CDT-transaction-v3_31_0.xsd
index 38032320d1d632b02cb6ac87c599a5ff675ec7b8..0cb1de81533a7aff46f6e7a702ab169f240de631 100644
--- a/v3_31_0/CDT-transaction-v3_31_0.xsd
+++ b/v3_31_0/CDT-transaction-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_31_0.xsd" />
 
 	<xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-transactionMgmt-v3_31_0.xsd b/v3_31_0/CDT-transactionMgmt-v3_31_0.xsd
index 23e6665e71d03485f97d9f80372157f8e14100ef..8ba121d89316fffa5bd6a09ec88c79b7c3e20ece 100644
--- a/v3_31_0/CDT-transactionMgmt-v3_31_0.xsd
+++ b/v3_31_0/CDT-transactionMgmt-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_31_0.xsd" />
 
 	<xs:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-triggerPayload-v3_31_0.xsd b/v3_31_0/CDT-triggerPayload-v3_31_0.xsd
index fcb00d40a85f7f7511baf8073b7aa13b67bb6034..bb3b8be0beca3315c1ce3e45e0d894a44b3588c6 100644
--- a/v3_31_0/CDT-triggerPayload-v3_31_0.xsd
+++ b/v3_31_0/CDT-triggerPayload-v3_31_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_31_0.xsd" />
 	
 	<xs:element name="triggerPayload">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-triggerRequest-v3_31_0.xsd b/v3_31_0/CDT-triggerRequest-v3_31_0.xsd
index 8950a4ded6cbe30f9f137a4b1f7c8b06c17b92b3..5d6e3f5085792fe39ee47855742cfc0b14a89253 100644
--- a/v3_31_0/CDT-triggerRequest-v3_31_0.xsd
+++ b/v3_31_0/CDT-triggerRequest-v3_31_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_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>