From 3f3cd33fdb4409c857fe150a82273abd87d440ac Mon Sep 17 00:00:00 2001
From: PeterNiblett <pdn3270@gmail.com>
Date: Thu, 29 Jan 2015 16:15:57 +0000
Subject: [PATCH] 0_8_0 -> 1_0_0 migration

---
 CDT-AE-v1_0_0.xsd                     |  15 ++-
 CDT-CSEBase-v1_0_0.xsd                |  36 +++---
 CDT-accessControlPolicy-v1_0_0.xsd    |   6 +-
 CDT-activeCmdhPolicy-v1_0_0.xsd       |  94 +++++++-------
 CDT-areaNwkDeviceInfo-v1_0_0.xsd      | 166 ++++++++++++-------------
 CDT-areaNwkInfo-v1_0_0.xsd            | 146 +++++++++++-----------
 CDT-battery-v1_0_0.xsd                | 148 +++++++++++------------
 CDT-cmdhBuffer-v1_0_0.xsd             | 111 +++++++++--------
 CDT-cmdhDefEcValue-v1_0_0.xsd         | 102 ++++++++--------
 CDT-cmdhDefaults-v1_0_0.xsd           | 106 ++++++++--------
 CDT-cmdhEcDefParamValues-v1_0_0.xsd   | 102 ++++++++--------
 CDT-cmdhLimits-v1_0_0.xsd             | 154 +++++++++++------------
 CDT-cmdhNetworkAccessRules-v1_0_0.xsd | 103 ++++++++--------
 CDT-cmdhNwAccessRule-v1_0_0.xsd       | 108 ++++++++---------
 CDT-cmdhPolicy-v1_0_0.xsd             | 110 ++++++++---------
 CDT-commonTypes-v1_0_0.xsd            |   4 +-
 CDT-container-v1_0_0.xsd              |  51 ++++----
 CDT-contentInstance-v1_0_0.xsd        |   6 +-
 CDT-delivery-v1_0_0.xsd               |   8 +-
 CDT-deviceCapability-v1_0_0.xsd       | 164 ++++++++++++-------------
 CDT-deviceInfo-v1_0_0.xsd             | 168 +++++++++++++-------------
 CDT-enumerationTypes-v1_0_0.xsd       |   3 +-
 CDT-eventConfig-v1_0_0.xsd            |   7 +-
 23 files changed, 959 insertions(+), 959 deletions(-)

diff --git a/CDT-AE-v1_0_0.xsd b/CDT-AE-v1_0_0.xsd
index 99db87f..743fad2 100644
--- a/CDT-AE-v1_0_0.xsd
+++ b/CDT-AE-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
 
 Notice of Disclaimer & Limitation of Liability 
 
@@ -26,13 +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-v0_8_0.xsd" />
-
-	<xs:include schemaLocation="CDT-container-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_0_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/CDT-CSEBase-v1_0_0.xsd b/CDT-CSEBase-v1_0_0.xsd
index a89d74e..c4194ba 100644
--- a/CDT-CSEBase-v1_0_0.xsd
+++ b/CDT-CSEBase-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
 
 Notice of Disclaimer & Limitation of Liability 
 
@@ -26,23 +26,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v0_8_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v0_8_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_0_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_0_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/CDT-accessControlPolicy-v1_0_0.xsd b/CDT-accessControlPolicy-v1_0_0.xsd
index 89c4eee..9443998 100644
--- a/CDT-accessControlPolicy-v1_0_0.xsd
+++ b/CDT-accessControlPolicy-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
 
 Notice of Disclaimer & Limitation of Liability 
 
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/CDT-activeCmdhPolicy-v1_0_0.xsd b/CDT-activeCmdhPolicy-v1_0_0.xsd
index b0bea7e..1635e5c 100644
--- a/CDT-activeCmdhPolicy-v1_0_0.xsd
+++ b/CDT-activeCmdhPolicy-v1_0_0.xsd
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-      targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols"
-      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-    <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> 
-
-    <xs:element name="activeCmdhPolicy">
-      <xs:complexType>
-        <xs:complexContent>
-          <!-- Inherit Common Attributes from regularResourceType  -->
-          <xs:extension base="m2m:mgmtResource">
-	           <xs:sequence>
-              <!-- Resource Specific Attributes -->
-	            <xs:element name="activeCmdhPolicyLink" type="m2m:ID" />	
-            </xs:sequence>
-          </xs:extension>  
-        </xs:complexContent> 	       
-      </xs:complexType>
-    </xs:element>
-</xs:schema> 
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
+      targetNamespace="http://www.onem2m.org/xml/protocols" 
+      xmlns:m2m="http://www.onem2m.org/xml/protocols"
+      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
+  
+    <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
+
+    <xs:element name="activeCmdhPolicy">
+      <xs:complexType>
+        <xs:complexContent>
+          <!-- Inherit Common Attributes from regularResourceType  -->
+          <xs:extension base="m2m:mgmtResource">
+	           <xs:sequence>
+              <!-- Resource Specific Attributes -->
+	            <xs:element name="activeCmdhPolicyLink" type="m2m:ID" />	
+            </xs:sequence>
+          </xs:extension>  
+        </xs:complexContent> 	       
+      </xs:complexType>
+    </xs:element>
+</xs:schema> 
+
diff --git a/CDT-areaNwkDeviceInfo-v1_0_0.xsd b/CDT-areaNwkDeviceInfo-v1_0_0.xsd
index 609c858..8dfdb0c 100644
--- a/CDT-areaNwkDeviceInfo-v1_0_0.xsd
+++ b/CDT-areaNwkDeviceInfo-v1_0_0.xsd
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<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" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
-	
-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-	
-	<xs:element name="areaNwkDeviceInfo">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from mgmtResource -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="devID" type="xs:string" />
-						<xs:element name="devType" type="xs:string" />
-						<xs:element name="areaNwkId" type="xs:anyURI" />
-						<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="status" type="xs:string" minOccurs="0" />
-						<xs:element name="listOfNeighbors" type="m2m:listOfURIs" />
-		     
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="areaNwkDeviceInfoAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from announcedMgmtResource -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="devID" type="xs:string" minOccurs="0" />
-						<xs:element name="devType" type="xs:string" minOccurs="0" />
-						<xs:element name="areaNwkId" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="status" type="xs:string" minOccurs="0" />
-						<xs:element name="listOfNeighbors" type="m2m:listOfURIs" minOccurs="0" />
-		     
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<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" 
+	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
+	
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	
+	<xs:element name="areaNwkDeviceInfo">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from mgmtResource -->
+				<xs:extension base="m2m:mgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="devID" type="xs:string" />
+						<xs:element name="devType" type="xs:string" />
+						<xs:element name="areaNwkId" type="xs:anyURI" />
+						<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
+						<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
+						<xs:element name="status" type="xs:string" minOccurs="0" />
+						<xs:element name="listOfNeighbors" type="m2m:listOfURIs" />
+		     
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
+						</xs:choice>             
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:element name="areaNwkDeviceInfoAnnc">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from announcedMgmtResource -->
+				<xs:extension base="m2m:announcedMgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="devID" type="xs:string" minOccurs="0" />
+						<xs:element name="devType" type="xs:string" minOccurs="0" />
+						<xs:element name="areaNwkId" type="xs:anyURI" minOccurs="0" />
+						<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
+						<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
+						<xs:element name="status" type="xs:string" minOccurs="0" />
+						<xs:element name="listOfNeighbors" type="m2m:listOfURIs" minOccurs="0" />
+		     
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
+						</xs:choice>             
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/CDT-areaNwkInfo-v1_0_0.xsd b/CDT-areaNwkInfo-v1_0_0.xsd
index 6bcd708..c3d8a53 100644
--- a/CDT-areaNwkInfo-v1_0_0.xsd
+++ b/CDT-areaNwkInfo-v1_0_0.xsd
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<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" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
-	
-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-	
-	<xs:element name="areaNwkInfo">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from mgmtResource -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="areaNwkType" type="xs:string" />
-						<xs:element name="listOfDevices" type="m2m:listOfURIs" />
-		    
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="areaNwkInfoAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from announcedMgmtResource -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="areaNwkType" type="xs:string" minOccurs="0" />
-						<xs:element name="listOfDevices" type="m2m:listOfURIs" minOccurs="0" />
-		    
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<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" 
+	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
+	
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	
+	<xs:element name="areaNwkInfo">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from mgmtResource -->
+				<xs:extension base="m2m:mgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="areaNwkType" type="xs:string" />
+						<xs:element name="listOfDevices" type="m2m:listOfURIs" />
+		    
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
+						</xs:choice>             
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:element name="areaNwkInfoAnnc">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from announcedMgmtResource -->
+				<xs:extension base="m2m:announcedMgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="areaNwkType" type="xs:string" minOccurs="0" />
+						<xs:element name="listOfDevices" type="m2m:listOfURIs" minOccurs="0" />
+		    
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
+						</xs:choice>             
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/CDT-battery-v1_0_0.xsd b/CDT-battery-v1_0_0.xsd
index 92312d3..310790e 100644
--- a/CDT-battery-v1_0_0.xsd
+++ b/CDT-battery-v1_0_0.xsd
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<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" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-	
-	<xs:element name="battery">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="batteryLevel" type="xs:unsignedInt"/>
-						<xs:element name="batteryStatus" type="m2m:batteryStatus" />
-		
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="batteryAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="batteryLevel" type="xs:unsignedInt" minOccurs="0" />
-						<xs:element name="batteryStatus" type="m2m:batteryStatus" minOccurs="0" />
-		
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<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" 
+	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	
+	<xs:element name="battery">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "mgmtResource" -->
+				<xs:extension base="m2m:mgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="batteryLevel" type="xs:unsignedInt"/>
+						<xs:element name="batteryStatus" type="m2m:batteryStatus" />
+		
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
+						</xs:choice>             
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:element name="batteryAnnc">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
+				<xs:extension base="m2m:announcedMgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="batteryLevel" type="xs:unsignedInt" minOccurs="0" />
+						<xs:element name="batteryStatus" type="m2m:batteryStatus" minOccurs="0" />
+		
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
+						</xs:choice>             
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/CDT-cmdhBuffer-v1_0_0.xsd b/CDT-cmdhBuffer-v1_0_0.xsd
index 03383e3..2bb95a2 100644
--- a/CDT-cmdhBuffer-v1_0_0.xsd
+++ b/CDT-cmdhBuffer-v1_0_0.xsd
@@ -1,56 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> 
-  
-  <xs:element name="cmdhBuffer">
-    <xs:complexType>
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes --> 
-            <!-- TODO:  typo in CR #663R04 in "list of m2m:leventCatWithDef", to be corrected by the Rapporteur -->
-            <xs:element name="applicableEventCategory" type="m2m:listOfEventCatWithDef" />
-            <xs:element name="maxBufferSize" type="xs:nonNegativeInteger" />  <!-- unit in bytes -->
-            <xs:element name="storagePriority">
-               <xs:simpleType>
-                 <xs:restriction base="xs:positiveInteger">
-                   <xs:maxExclusive value="11"/>
-                 </xs:restriction>
-               </xs:simpleType>
-            </xs:element>       
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
+  targetNamespace="http://www.onem2m.org/xml/protocols" 
+  xmlns:m2m="http://www.onem2m.org/xml/protocols"
+  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
+  
+  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
+  
+  <xs:element name="cmdhBuffer">
+    <xs:complexType>
+      <xs:complexContent>
+        <!-- Inherit Common Attributes from data type "mgmtResource" -->
+        <xs:extension base="m2m:mgmtResource">
+          <xs:sequence>
+            <!-- mgmtObj specialization-specific Attributes --> 
+            <xs:element name="applicableEventCategory" type="m2m:listOfEventCatWithDef" />
+            <xs:element name="maxBufferSize" type="xs:nonNegativeInteger" />  <!-- unit in bytes -->
+            <xs:element name="storagePriority">
+               <xs:simpleType>
+                 <xs:restriction base="xs:positiveInteger">
+                   <xs:maxExclusive value="11"/>
+                 </xs:restriction>
+               </xs:simpleType>
+            </xs:element>       
+          </xs:sequence>
+        </xs:extension>  
+      </xs:complexContent> 	
+    </xs:complexType>
+  </xs:element>
+</xs:schema> 
+
diff --git a/CDT-cmdhDefEcValue-v1_0_0.xsd b/CDT-cmdhDefEcValue-v1_0_0.xsd
index 603f490..a5a3492 100644
--- a/CDT-cmdhDefEcValue-v1_0_0.xsd
+++ b/CDT-cmdhDefEcValue-v1_0_0.xsd
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> 
-  
-  <xs:element name="cmdhDefEcValue">
-    <xs:complexType>
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <xs:element name="order" type="xs:positiveInteger" />
-            <xs:element name="defEcValue" type="m2m:eventCat" />
-            <xs:element name="requestOrigin" type="m2m:listOfM2MID" />
-            <xs:element name="requestContext" type="xs:anyType" minOccurs="0" />
-            <xs:element name="requestContextNotification" type="xs:boolean" minOccurs="0" />
-            <xs:element name="requestCharacteristics" type="xs:anyType" minOccurs="0" />
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	      
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
+  targetNamespace="http://www.onem2m.org/xml/protocols" 
+  xmlns:m2m="http://www.onem2m.org/xml/protocols"
+  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
+  
+  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
+  
+  <xs:element name="cmdhDefEcValue">
+    <xs:complexType>
+      <xs:complexContent>
+        <!-- Inherit Common Attributes from data type "mgmtResource" -->
+        <xs:extension base="m2m:mgmtResource">
+          <xs:sequence>
+            <!-- mgmtObj specialization-specific Attributes -->
+            <xs:element name="order" type="xs:positiveInteger" />
+            <xs:element name="defEcValue" type="m2m:eventCat" />
+            <xs:element name="requestOrigin" type="m2m:listOfM2MID" />
+            <xs:element name="requestContext" type="xs:anyType" minOccurs="0" />
+            <xs:element name="requestContextNotification" type="xs:boolean" minOccurs="0" />
+            <xs:element name="requestCharacteristics" type="xs:anyType" minOccurs="0" />
+          </xs:sequence>
+        </xs:extension>  
+      </xs:complexContent> 	      
+    </xs:complexType>
+  </xs:element>
+</xs:schema> 
diff --git a/CDT-cmdhDefaults-v1_0_0.xsd b/CDT-cmdhDefaults-v1_0_0.xsd
index f94df31..ba2eb4b 100644
--- a/CDT-cmdhDefaults-v1_0_0.xsd
+++ b/CDT-cmdhDefaults-v1_0_0.xsd
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> 
-  
-    <xs:element name="cmdhDefaults">
-      <xs:complexType>
-        <xs:complexContent>
-          <!-- Inherit Common Attributes from data type "mgmtResource" -->
-          <xs:extension base="m2m:mgmtResource">
-	          <xs:sequence>
-	            <!-- this resource type has no mgmtObj specialization-specific Attributes -->
-	            <!-- Instantiations of this [cmdhDefaults] resource type shall include mgmntLink's to
-	               the following children:
-              1 or more mgmtLink to instance(s) of resource type [cmdhDefEcValue]
-	            1 or more mgmtLink to instance(s) of resource type [cmdhEcDefParamValues]              -->	    
-	            <!-- TODO: text in Table D.12.2-2 column "Default Value and Constraints" needs to be updated
-	                       ref to [cmdhEcDefParamValues] is missing  -->
-              <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="2" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:extension>  
-        </xs:complexContent>
-      </xs:complexType>
-    </xs:element>
-</xs:schema> 
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
+  targetNamespace="http://www.onem2m.org/xml/protocols" 
+  xmlns:m2m="http://www.onem2m.org/xml/protocols"
+  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
+  
+  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
+  
+    <xs:element name="cmdhDefaults">
+      <xs:complexType>
+        <xs:complexContent>
+          <!-- Inherit Common Attributes from data type "mgmtResource" -->
+          <xs:extension base="m2m:mgmtResource">
+	          <xs:sequence>
+	            <!-- this resource type has no mgmtObj specialization-specific Attributes -->
+	            <!-- Instantiations of this [cmdhDefaults] resource type shall include mgmntLink's to
+	               the following children:
+              1 or more mgmtLink to instance(s) of resource type [cmdhDefEcValue]
+	            1 or more mgmtLink to instance(s) of resource type [cmdhEcDefParamValues]              -->	    
+	            <!-- TODO: text in Table D.12.2-2 column "Default Value and Constraints" needs to be updated
+	                       ref to [cmdhEcDefParamValues] is missing  -->
+              <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="2" maxOccurs="unbounded"/>
+            </xs:sequence>
+          </xs:extension>  
+        </xs:complexContent>
+      </xs:complexType>
+    </xs:element>
+</xs:schema> 
+
diff --git a/CDT-cmdhEcDefParamValues-v1_0_0.xsd b/CDT-cmdhEcDefParamValues-v1_0_0.xsd
index c8574be..f362ae1 100644
--- a/CDT-cmdhEcDefParamValues-v1_0_0.xsd
+++ b/CDT-cmdhEcDefParamValues-v1_0_0.xsd
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> 
-  
-  <xs:element name="cmdhEcDefParamValues">    
-    <xs:complexType>     
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <xs:element name="applicableEventCategory" type="m2m:listOfEventCatWithDef" />
-            <xs:element name="defaultRequestExpTime" type="xs:long" />  <!-- units in milliseconds -->
-            <xs:element name="defaultResultExpTime" type="xs:long" /> <!-- units in milliseconds -->
-            <xs:element name="defaultOpExecTime" type="xs:long" /> <!-- units in milliseconds -->
-            <xs:element name="defaultRespPersistence" type="xs:long" /> <!-- units in milliseconds -->
-            <xs:element name="defaultDelAggregation" type="xs:boolean" />
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	    
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
+  targetNamespace="http://www.onem2m.org/xml/protocols" 
+  xmlns:m2m="http://www.onem2m.org/xml/protocols"
+  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
+  
+  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
+  
+  <xs:element name="cmdhEcDefParamValues">    
+    <xs:complexType>     
+      <xs:complexContent>
+        <!-- Inherit Common Attributes from data type "mgmtResource" -->
+        <xs:extension base="m2m:mgmtResource">
+          <xs:sequence>
+            <!-- mgmtObj specialization-specific Attributes -->
+            <xs:element name="applicableEventCategory" type="m2m:listOfEventCatWithDef" />
+            <xs:element name="defaultRequestExpTime" type="xs:long" />  <!-- units in milliseconds -->
+            <xs:element name="defaultResultExpTime" type="xs:long" /> <!-- units in milliseconds -->
+            <xs:element name="defaultOpExecTime" type="xs:long" /> <!-- units in milliseconds -->
+            <xs:element name="defaultRespPersistence" type="xs:long" /> <!-- units in milliseconds -->
+            <xs:element name="defaultDelAggregation" type="xs:boolean" />
+          </xs:sequence>
+        </xs:extension>  
+      </xs:complexContent> 	    
+    </xs:complexType>
+  </xs:element>
+</xs:schema> 
diff --git a/CDT-cmdhLimits-v1_0_0.xsd b/CDT-cmdhLimits-v1_0_0.xsd
index a66e942..5afb4f7 100644
--- a/CDT-cmdhLimits-v1_0_0.xsd
+++ b/CDT-cmdhLimits-v1_0_0.xsd
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> 
-  <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-  
-  <xs:element name="cmdhLimits">
-    <xs:complexType>
-      
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <xs:element name="order" type="xs:positiveInteger" />
-            <xs:element name="requestOrigin" type="m2m:listOfM2MID" />
-            <!-- TODO change to xs:anyType missing in CR #663R04 -->
-            <xs:element name="requestContext" type="xs:anyType" />
-            <xs:element name="requestContextNotification" type="xs:boolean"  minOccurs="0" />
-            <!-- TODO change to xs:anyType missing in CR #663R04 -->
-            <xs:element name="requestCharacteristics" type="xs:anyType"  />
-            <xs:element name="limitsEventCategory" type="m2m:listOfEventCat" />
-            <xs:element name="limitsRequestExpTime" type="m2m:listOfMinMax" />
-            <xs:element name="limitsResultExpTime" type="m2m:listOfMinMax" />
-            <xs:element name="limitsOpExecTime" type="m2m:listOfMinMax" />
-            <xs:element name="limitsRespPersistence" type="m2m:listOfMinMax" />
-            <!-- TODO: check was happened with implementation of "m2m:permittedBooleanValues" in #661R04 -->
-            <xs:element name="limitsDelAggregation" >
-                <xs:simpleType>
-                    <xs:restriction base="xs:token">
-                    <xs:annotation>
-                        <xs:documentation>defines data type denoted "m2m:permittedBooleanValues" in #663R04.
-                        </xs:documentation>
-                    </xs:annotation>
-                    <!-- False -->
-                    <xs:enumeration value="0" />
-                    <!-- True -->
-                    <xs:enumeration value="1" />
-                    <!-- True and False -->
-                    <xs:enumeration value="0 1" />
-                    </xs:restriction>
-                </xs:simpleType>
-            </xs:element>         
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	    
-    </xs:complexType>
-  </xs:element>
-  
-</xs:schema> 
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
+  targetNamespace="http://www.onem2m.org/xml/protocols" 
+  xmlns:m2m="http://www.onem2m.org/xml/protocols"
+  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
+  
+  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+  
+  <xs:element name="cmdhLimits">
+    <xs:complexType>
+      
+      <xs:complexContent>
+        <!-- Inherit Common Attributes from data type "mgmtResource" -->
+        <xs:extension base="m2m:mgmtResource">
+          <xs:sequence>
+            <!-- mgmtObj specialization-specific Attributes -->
+            <xs:element name="order" type="xs:positiveInteger" />
+            <xs:element name="requestOrigin" type="m2m:listOfM2MID" />
+            <!-- TODO In TS-0004 requestContext is shown as xs:string rather than xs:anyType -->
+            <xs:element name="requestContext" type="xs:anyType" />
+            <xs:element name="requestContextNotification" type="xs:boolean"  minOccurs="0" />
+            <!-- TODO In TS-0004 requestCharacteristics is shown as xs:string rather than xs:anyType -->
+            <xs:element name="requestCharacteristics" type="xs:anyType"  />
+            <xs:element name="limitsEventCategory" type="m2m:listOfEventCat" />
+            <xs:element name="limitsRequestExpTime" type="m2m:listOfMinMax" />
+            <xs:element name="limitsResultExpTime" type="m2m:listOfMinMax" />
+            <xs:element name="limitsOpExecTime" type="m2m:listOfMinMax" />
+            <xs:element name="limitsRespPersistence" type="m2m:listOfMinMax" />
+            <!-- TODO: TS-0004 D.12.5 uses type "m2m:permittedBooleanValues" -->
+            <xs:element name="limitsDelAggregation" >
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                    <xs:annotation>
+                        <xs:documentation>defines data type denoted "m2m:permittedBooleanValues" in TS-0004 D.12.5
+                        </xs:documentation>
+                    </xs:annotation>
+                    <!-- False -->
+                    <xs:enumeration value="0" />
+                    <!-- True -->
+                    <xs:enumeration value="1" />
+                    <!-- True and False -->
+                    <xs:enumeration value="0 1" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:element>         
+          </xs:sequence>
+        </xs:extension>  
+      </xs:complexContent> 	    
+    </xs:complexType>
+  </xs:element>
+  
+</xs:schema> 
diff --git a/CDT-cmdhNetworkAccessRules-v1_0_0.xsd b/CDT-cmdhNetworkAccessRules-v1_0_0.xsd
index 85e139b..8cfa47d 100644
--- a/CDT-cmdhNetworkAccessRules-v1_0_0.xsd
+++ b/CDT-cmdhNetworkAccessRules-v1_0_0.xsd
@@ -1,52 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> 
-  
-  <xs:element name="cmdhNetworkAccessRules">
-    <xs:complexType>
-      
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <!-- TODO:  typo in CR #663R04 in "list of m2m:leventCatWithDef", to be corrected by the Rapporteur -->
-            <xs:element name="applicableEventCategories" type="m2m:listOfEventCatWithDef" />
-            <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
-	               the following children:
-	               zero or more mgmtLink to instance(s) of resource type [cmdhNwAccessRule]       -->
-            <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="0" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	     
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
+  targetNamespace="http://www.onem2m.org/xml/protocols" 
+  xmlns:m2m="http://www.onem2m.org/xml/protocols"
+  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
+  
+  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
+  
+  <xs:element name="cmdhNetworkAccessRules">
+    <xs:complexType>
+      
+      <xs:complexContent>
+        <!-- Inherit Common Attributes from data type "mgmtResource" -->
+        <xs:extension base="m2m:mgmtResource">
+          <xs:sequence>
+            <!-- mgmtObj specialization-specific Attributes -->
+             <xs:element name="applicableEventCategories" type="m2m:listOfEventCatWithDef" />
+            <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
+	               the following children:
+	               zero or more mgmtLink to instance(s) of resource type [cmdhNwAccessRule]       -->
+            <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="0" maxOccurs="unbounded"/>
+          </xs:sequence>
+        </xs:extension>  
+      </xs:complexContent> 	     
+    </xs:complexType>
+  </xs:element>
+</xs:schema> 
diff --git a/CDT-cmdhNwAccessRule-v1_0_0.xsd b/CDT-cmdhNwAccessRule-v1_0_0.xsd
index 5f167e9..17a37f9 100644
--- a/CDT-cmdhNwAccessRule-v1_0_0.xsd
+++ b/CDT-cmdhNwAccessRule-v1_0_0.xsd
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> 
-  
-  <xs:element name="cmdhNwAccessRule">
-    <xs:complexType>
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <xs:element name="targetNetwork" type="m2m:listOfM2MID" minOccurs="1" maxOccurs="1" />
-            <xs:element name="minReqVolume" type="xs:nonNegativeInteger" minOccurs="1" maxOccurs="1" />
-            <xs:element name="backOffParameters" type="m2m:backOffParameters" minOccurs="1" maxOccurs="1" />
-            <xs:element name="otherConditions" type="xs:anyType" minOccurs="1" maxOccurs="1" />
-            <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
-	               the following children:
-	               zero or more mgmtLink to instance(s) of resource type schedule       -->
-            <!-- TODO: clarify if multiple schedule elements shall be included rather than a link to non-mgmtObj specialization -->
-            <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="1" />
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	       
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
+  targetNamespace="http://www.onem2m.org/xml/protocols" 
+  xmlns:m2m="http://www.onem2m.org/xml/protocols"
+  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
+  
+  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
+  
+  <xs:element name="cmdhNwAccessRule">
+    <xs:complexType>
+      <xs:complexContent>
+        <!-- Inherit Common Attributes from data type "mgmtResource" -->
+        <xs:extension base="m2m:mgmtResource">
+          <xs:sequence>
+            <!-- mgmtObj specialization-specific Attributes -->
+            <xs:element name="targetNetwork" type="m2m:listOfM2MID" minOccurs="1" maxOccurs="1" />
+            <xs:element name="minReqVolume" type="xs:nonNegativeInteger" minOccurs="1" maxOccurs="1" />
+            <xs:element name="backOffParameters" type="m2m:backOffParameters" minOccurs="1" maxOccurs="1" />
+            <xs:element name="otherConditions" type="xs:anyType" minOccurs="1" maxOccurs="1" />
+            <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
+	               the following children:
+	               zero or more mgmtLink to instance(s) of resource type schedule       -->
+            <!-- TODO: clarify if multiple schedule elements shall be included rather than a link to non-mgmtObj specialization -->
+            <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="1" />
+          </xs:sequence>
+        </xs:extension>  
+      </xs:complexContent> 	       
+    </xs:complexType>
+  </xs:element>
+</xs:schema> 
diff --git a/CDT-cmdhPolicy-v1_0_0.xsd b/CDT-cmdhPolicy-v1_0_0.xsd
index e4def53..5d9b3a6 100644
--- a/CDT-cmdhPolicy-v1_0_0.xsd
+++ b/CDT-cmdhPolicy-v1_0_0.xsd
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-      targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols"
-      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-
-    <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> 
-
-    <xs:element name="cmdhPolicy" >
-      <xs:complexType>
-        <xs:complexContent>
-          <!-- Inherit Common Attributes from data type "mgmtResource" -->
-          <xs:extension base="m2m:mgmtResource">
-	        <xs:sequence>
-           <!-- mgmtObj specialization-specific Attributes -->
-              <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" />
-	          <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
-	               the following children:
-	            1 mgmtLink to an instance of resource type [cmdhDefaults], 
-	            1 or more mgmtLink to instance(s) of resource type [cmdhLimits], 
-	            1 or more mgmtLink to instance(s) of resource type [cmdhNetworkAccessRules]
-	            1 or more mgmtLink to instance(s) of resource type [cmdhBuffer]              -->
-	          <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="4" maxOccurs="unbounded"/>
-
-            </xs:sequence>
-          </xs:extension> 
-        </xs:complexContent> 	       
-      </xs:complexType>
-    </xs:element>
-</xs:schema> 
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
+      targetNamespace="http://www.onem2m.org/xml/protocols" 
+      xmlns:m2m="http://www.onem2m.org/xml/protocols"
+      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
+
+    <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
+
+    <xs:element name="cmdhPolicy" >
+      <xs:complexType>
+        <xs:complexContent>
+          <!-- Inherit Common Attributes from data type "mgmtResource" -->
+          <xs:extension base="m2m:mgmtResource">
+	        <xs:sequence>
+           <!-- mgmtObj specialization-specific Attributes -->
+              <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" />
+	          <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
+	               the following children:
+	            1 mgmtLink to an instance of resource type [cmdhDefaults], 
+	            1 or more mgmtLink to instance(s) of resource type [cmdhLimits], 
+	            1 or more mgmtLink to instance(s) of resource type [cmdhNetworkAccessRules]
+	            1 or more mgmtLink to instance(s) of resource type [cmdhBuffer]              -->
+	          <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="4" maxOccurs="unbounded"/>
+
+            </xs:sequence>
+          </xs:extension> 
+        </xs:complexContent> 	       
+      </xs:complexType>
+    </xs:element>
+</xs:schema> 
+
diff --git a/CDT-commonTypes-v1_0_0.xsd b/CDT-commonTypes-v1_0_0.xsd
index b6df517..6502793 100644
--- a/CDT-commonTypes-v1_0_0.xsd
+++ b/CDT-commonTypes-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
 
 Notice of Disclaimer & Limitation of Liability 
 
@@ -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-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v1_0_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/CDT-container-v1_0_0.xsd b/CDT-container-v1_0_0.xsd
index da455ec..8122e1b 100644
--- a/CDT-container-v1_0_0.xsd
+++ b/CDT-container-v1_0_0.xsd
@@ -1,29 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright Notification The oneM2M Partners authorize you to copy this document, provided 
-	that you retain all copyright and other proprietary notices contained in the original materials 
-	on any copies of the materials and that you comply strictly with these terms. This copyright 
-	permission does not constitute an endorsement of the products or services, nor does it encompass 
-	the granting of any patent rights. The oneM2M Partners assume no responsibility for errors 
-	or omissions in this document. © 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, 
-	TTA, TTC). All rights reserved. Notice of Disclaimer & Limitation of Liability The information 
-	provided in this document is directed solely to professionals who have the appropriate degree 
-	of experience to understand and interpret its contents in accordance with generally accepted 
-	engineering or other professional standards and applicable regulations. No recommendation as 
-	to products or vendors is made or should be implied. NO REPRESENTATION OR WARRANTY IS MADE 
-	THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, GOVERNMENTAL 
-	RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR 
-	FITNESS FOR ANY PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-	NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT 
-	BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M 
-	BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. oneM2M EXPRESSLY ADVISES 
-	ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK 
-	OF THE USER. -->
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
 	
 <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-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
@@ -92,4 +97,4 @@
 			</xs:complexContent>
 		</xs:complexType>
 	</xs:element>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/CDT-contentInstance-v1_0_0.xsd b/CDT-contentInstance-v1_0_0.xsd
index 2be0190..4e37f95 100644
--- a/CDT-contentInstance-v1_0_0.xsd
+++ b/CDT-contentInstance-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
 
 Notice of Disclaimer & Limitation of Liability 
 
@@ -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-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
 
 
 
@@ -67,4 +67,4 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			</xs:complexContent>
 		</xs:complexType>
 	</xs:element>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/CDT-delivery-v1_0_0.xsd b/CDT-delivery-v1_0_0.xsd
index fadb16c..710116b 100644
--- a/CDT-delivery-v1_0_0.xsd
+++ b/CDT-delivery-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
 
 Notice of Disclaimer & Limitation of Liability 
 
@@ -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-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
 
 
 	<xs:element name="delivery">
@@ -59,4 +59,4 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			</xs:complexContent>
 		</xs:complexType>
 	</xs:element>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/CDT-deviceCapability-v1_0_0.xsd b/CDT-deviceCapability-v1_0_0.xsd
index 60eff43..f5918c1 100644
--- a/CDT-deviceCapability-v1_0_0.xsd
+++ b/CDT-deviceCapability-v1_0_0.xsd
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<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" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
-
-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-	
-	<xs:element name="deviceCapability">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from mgmtResource  -->
-				<xs:extension base="m2m:mgmtResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes  -->
-						<xs:element name="capabilityName" type="xs:string" />
-						<xs:element name="attached" type="xs:boolean" />
-						<xs:element name="capabilityActionStatus" type="m2m:actionStatus" />
-						<xs:element name="currentState" type="xs:boolean" />
-						<xs:element name="enable" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="disable" type="xs:boolean" minOccurs="0"/>
-			  
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="deviceCapabilityAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from announcedMgmtResource  -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes  -->
-						<xs:element name="capabilityName" type="xs:string" minOccurs="0" />
-						<xs:element name="attached" type="xs:boolean" minOccurs="0" />
-						<xs:element name="capabilityActionStatus" type="m2m:actionStatus" minOccurs="0" />
-						<xs:element name="currentState" type="xs:boolean" minOccurs="0" />
-						<xs:element name="enable" type="xs:boolean" minOccurs="0" />
-						<xs:element name="disable" type="xs:boolean" minOccurs="0" />
-			  
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<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" 
+	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
+
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	
+	<xs:element name="deviceCapability">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit common attributes from mgmtResource  -->
+				<xs:extension base="m2m:mgmtResource">
+					<xs:sequence>
+						<!-- Resource Specific Attributes  -->
+						<xs:element name="capabilityName" type="xs:string" />
+						<xs:element name="attached" type="xs:boolean" />
+						<xs:element name="capabilityActionStatus" type="m2m:actionStatus" />
+						<xs:element name="currentState" type="xs:boolean" />
+						<xs:element name="enable" type="xs:boolean" minOccurs="0"/>
+						<xs:element name="disable" type="xs:boolean" minOccurs="0"/>
+			  
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:element name="deviceCapabilityAnnc">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit common attributes from announcedMgmtResource  -->
+				<xs:extension base="m2m:announcedMgmtResource">
+					<xs:sequence>
+						<!-- Resource Specific Attributes  -->
+						<xs:element name="capabilityName" type="xs:string" minOccurs="0" />
+						<xs:element name="attached" type="xs:boolean" minOccurs="0" />
+						<xs:element name="capabilityActionStatus" type="m2m:actionStatus" minOccurs="0" />
+						<xs:element name="currentState" type="xs:boolean" minOccurs="0" />
+						<xs:element name="enable" type="xs:boolean" minOccurs="0" />
+						<xs:element name="disable" type="xs:boolean" minOccurs="0" />
+			  
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/CDT-deviceInfo-v1_0_0.xsd b/CDT-deviceInfo-v1_0_0.xsd
index 4449892..46deb23 100644
--- a/CDT-deviceInfo-v1_0_0.xsd
+++ b/CDT-deviceInfo-v1_0_0.xsd
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<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" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-	
-	<xs:element name="deviceInfo">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from mgmtResource  -->
-				<xs:extension base="m2m:mgmtResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes  -->
-						<xs:element name="deviceLabel" type="xs:string" />
-						<xs:element name="manufacturer" type="xs:string" />
-						<xs:element name="model" type="xs:string" />
-						<xs:element name="deviceType" type="xs:string" />
-						<xs:element name="fwVersion" type="xs:string" />
-						<xs:element name="swVersion" type="xs:string" />
-						<xs:element name="hwVersion" type="xs:string" />
-			   
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>  
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="deviceInfoAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from announcedMgmtResource  -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes  -->
-						<xs:element name="deviceLabel" type="xs:string" minOccurs="0" />
-						<xs:element name="manufacturer" type="xs:string" minOccurs="0" />
-						<xs:element name="model" type="xs:string" minOccurs="0" />
-						<xs:element name="deviceType" type="xs:string" minOccurs="0" />
-						<xs:element name="fwVersion" type="xs:string" minOccurs="0" />
-						<xs:element name="swVersion" type="xs:string" minOccurs="0" />
-						<xs:element name="hwVersion" type="xs:string" minOccurs="0" />
-			   
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>  
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
+No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<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" 
+	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	
+	<xs:element name="deviceInfo">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit common attributes from mgmtResource  -->
+				<xs:extension base="m2m:mgmtResource">
+					<xs:sequence>
+						<!-- Resource Specific Attributes  -->
+						<xs:element name="deviceLabel" type="xs:string" />
+						<xs:element name="manufacturer" type="xs:string" />
+						<xs:element name="model" type="xs:string" />
+						<xs:element name="deviceType" type="xs:string" />
+						<xs:element name="fwVersion" type="xs:string" />
+						<xs:element name="swVersion" type="xs:string" />
+						<xs:element name="hwVersion" type="xs:string" />
+			   
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+						</xs:choice>  
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:element name="deviceInfoAnnc">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit common attributes from announcedMgmtResource  -->
+				<xs:extension base="m2m:announcedMgmtResource">
+					<xs:sequence>
+						<!-- Resource Specific Attributes  -->
+						<xs:element name="deviceLabel" type="xs:string" minOccurs="0" />
+						<xs:element name="manufacturer" type="xs:string" minOccurs="0" />
+						<xs:element name="model" type="xs:string" minOccurs="0" />
+						<xs:element name="deviceType" type="xs:string" minOccurs="0" />
+						<xs:element name="fwVersion" type="xs:string" minOccurs="0" />
+						<xs:element name="swVersion" type="xs:string" minOccurs="0" />
+						<xs:element name="hwVersion" type="xs:string" minOccurs="0" />
+			   
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+						</xs:choice>  
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/CDT-enumerationTypes-v1_0_0.xsd b/CDT-enumerationTypes-v1_0_0.xsd
index 5127f71..dbf8e2d 100644
--- a/CDT-enumerationTypes-v1_0_0.xsd
+++ b/CDT-enumerationTypes-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
 
 
 Notice of Disclaimer & Limitation of Liability 
@@ -218,7 +218,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction>
 	</xs:simpleType>
 
-	<!-- TODO: alignment of TS-0004 still needed: m2m:responseStatusCode should replace any remaining occurences of m2m:responseStatus  -->
 	<xs:simpleType name="responseStatusCode">
 		<xs:annotation>
 			<xs:documentation></xs:documentation>
diff --git a/CDT-eventConfig-v1_0_0.xsd b/CDT-eventConfig-v1_0_0.xsd
index d0e5394..d24662a 100644
--- a/CDT-eventConfig-v1_0_0.xsd
+++ b/CDT-eventConfig-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
 
 Notice of Disclaimer & Limitation of Liability 
 
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
@@ -39,7 +39,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="creator" type="m2m:ID" />
 						<xs:element name="eventID" type="xs:string" />
 						<xs:element name="eventType" type="m2m:eventType" />
-						<!-- TODO: The next two types are shown as xs:dateTime in TS-0004   -->
 						<xs:element name="eventStart" type="m2m:timestamp" minOccurs="0" />
 						<xs:element name="eventEnd" type="m2m:timestamp" minOccurs="0" />
 						<xs:element name="operationType" minOccurs="0">
-- 
GitLab