diff --git a/CDT-commonTypes-v0_8_0.xsd b/CDT-commonTypes-v0_8_0.xsd
index dfdc1299694e5becd09b9080242cb9d327698503..778c5f41ee53fa75558b26df50a3cae9635ba7e0 100644
--- a/CDT-commonTypes-v0_8_0.xsd
+++ b/CDT-commonTypes-v0_8_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 	<xs:include schemaLocation="CDT-enumerationTypes-v0_8_0.xsd" />
 
-	<!-- -->
-	<!-- oneM2M Simple Types -->
-	<!-- -->
+	<!--********************** -->
+	<!-- oneM2M Simple Types   -->
+	<!--********************** -->
 
 
 	<!-- TODO: Choose appropriate definitions for the id types (xs:token is placeholder for now) -->
@@ -173,15 +173,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	</xs:simpleType>
 
 	<xs:simpleType name="scheduleEntry">
-<!-- 		<xs:restriction base="xs:string"> -->
-<!-- 			<xs:pattern -->
-<!-- 				value="([*\d/,-]+\s+){3}[*\d/#L,-]+\s+(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC|[*\d/,-])+\s+(SUN|MON|TUE|WED|THU|FRI|SAT|[*\dL#/,-])+\s+[*\d/,-]+" /> -->
-<!-- 		</xs:restriction> -->
-		  <xs:restriction base="xs:string">
-            <xs:pattern value="(([*]|[1-5]?\d([,-][1-5]?\d)*)\s+){2}([*]|((1?\d|2[0-3])([,-](\d|1\d|2[0-3]))*))\s+([*]|(([1-9]|1\d|2\d|3[01])([,-]([1-9]|1\d|2\d|3[01]))*))\s+([*]|(([1-9]|1[0-2])([,-]([1-9]|1[0-2]))*))\s+[*]|([0-6]([,-][0-6])*)" />
-            <xs:pattern value="[*]|([0-6]([,-][0-6])*)" />
-      
-        </xs:restriction>
+		<xs:restriction base="xs:string">
+			<xs:pattern
+				value="(([*]|[1-5]?\d([,-][1-5]?\d)*)\s+){2}([*]|((1?\d|2[0-3])([,-](1?\d|2[0-3]))*))\s+([*]|(([1-9]|1\d|2\d|3[01])([,-]([1-9]|1\d|2\d|3[01]))*))\s+([*]|(([1-9]|1[0-2])([,-]([1-9]|1[0-2]))*))\s+[*]|([0-6]([,-][0-6])*)" />
+		</xs:restriction>
 	</xs:simpleType>
 
 	<xs:simpleType name="triggerRecipientId">
@@ -193,9 +188,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	</xs:simpleType>
 
 
-	<!--**********************-->
+	<!--********************** -->
 	<!-- oneM2M Complex Types -->
-    <!--**********************-->
+	<!--********************** -->
 
 	<xs:complexType name="deliveryMetaData">
 		<xs:sequence>
@@ -352,38 +347,38 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
-	
+
 	<xs:complexType name="softwareInstallArgsType">
-        <xs:sequence>
-            <xs:element name="URL" type="xs:anyURI" />
-            <xs:element name="UUID" type="xs:string" />
-            <xs:element name="username" type="xs:string" />
-            <xs:element name="password" type="xs:string" />
-            <xs:element name="executionEnvRef" type="xs:string" />
-            <xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-    </xs:complexType>
-    
-    <xs:complexType name="softwareUpdateArgsType">
-        <xs:sequence>
-            <xs:element name="UUID" type="xs:string" />
-            <xs:element name="version" type="xs:string" />
-            <xs:element name="URL" type="xs:anyURI" />
-            <xs:element name="username" type="xs:string" />
-            <xs:element name="password" type="xs:string" />
-            <xs:element name="executionEnvRef" type="xs:string" />
-            <xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-    </xs:complexType>
-    
-        <xs:complexType name="softwareUninstallArgsType">
-        <xs:sequence>
-            <xs:element name="UUID" type="xs:string" />
-            <xs:element name="version" type="xs:string" />
-            <xs:element name="executionEnvRef" type="xs:string" />
-            <xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-    </xs:complexType>
+		<xs:sequence>
+			<xs:element name="URL" type="xs:anyURI" />
+			<xs:element name="UUID" type="xs:string" />
+			<xs:element name="username" type="xs:string" />
+			<xs:element name="password" type="xs:string" />
+			<xs:element name="executionEnvRef" type="xs:string" />
+			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="softwareUpdateArgsType">
+		<xs:sequence>
+			<xs:element name="UUID" type="xs:string" />
+			<xs:element name="version" type="xs:string" />
+			<xs:element name="URL" type="xs:anyURI" />
+			<xs:element name="username" type="xs:string" />
+			<xs:element name="password" type="xs:string" />
+			<xs:element name="executionEnvRef" type="xs:string" />
+			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="softwareUninstallArgsType">
+		<xs:sequence>
+			<xs:element name="UUID" type="xs:string" />
+			<xs:element name="version" type="xs:string" />
+			<xs:element name="executionEnvRef" type="xs:string" />
+			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
 
 	<xs:complexType name="anyArgsListType">
 		<xs:sequence>
@@ -393,14 +388,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 	<xs:complexType name="execReqArgsListType">
 		<xs:choice>
-			<xs:element name="reset" type="m2m:resetArgsType" maxOccurs="unbounded"/>
-			<xs:element name="reboot" type="m2m:rebootArgsType"  maxOccurs="unbounded"/>
-			<xs:element name="upload" type="m2m:uploadArgsType"  maxOccurs="unbounded"/>
-			<xs:element name="download" type="m2m:downloadArgsType"  maxOccurs="unbounded"/>
-			<xs:element name="softwareInstall" type="m2m:softwareInstallArgsType" maxOccurs="unbounded"/>
-			<xs:element name="softwareUpdate" type="m2m:softwareUpdateArgsType"  maxOccurs="unbounded" />
-			<xs:element name="softwareUninstall" type="m2m:softwareUninstallArgsType"  maxOccurs="unbounded"/>
-			<xs:element name="anyArg" type="m2m:anyArgsListType" minOccurs="0"  maxOccurs="unbounded"/>
+			<xs:element name="reset" type="m2m:resetArgsType" maxOccurs="unbounded" />
+			<xs:element name="reboot" type="m2m:rebootArgsType" maxOccurs="unbounded" />
+			<xs:element name="upload" type="m2m:uploadArgsType" maxOccurs="unbounded" />
+			<xs:element name="download" type="m2m:downloadArgsType" maxOccurs="unbounded" />
+			<xs:element name="softwareInstall" type="m2m:softwareInstallArgsType" maxOccurs="unbounded" />
+			<xs:element name="softwareUpdate" type="m2m:softwareUpdateArgsType" maxOccurs="unbounded" />
+			<xs:element name="softwareUninstall" type="m2m:softwareUninstallArgsType" maxOccurs="unbounded" />
+			<xs:element name="anyArg" type="m2m:anyArgsListType" minOccurs="0" maxOccurs="unbounded" />
 		</xs:choice>
 	</xs:complexType>