diff --git a/v2_24_0/CDT-enumerationTypes-v2_24_0.xsd b/v2_24_0/CDT-enumerationTypes-v2_24_0.xsd
index a54cdb8a46bad339f09fe044f6d13be7627e91d1..69ad528aa1d955245b710f61adf51840e1a537dd 100644
--- a/v2_24_0/CDT-enumerationTypes-v2_24_0.xsd
+++ b/v2_24_0/CDT-enumerationTypes-v2_24_0.xsd
@@ -69,8 +69,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- schedule -->
 			<xs:enumeration value="18" />
 			<!-- serviceSubscribedAppRule -->
-            <xs:enumeration value="19" />
-            <!-- serviceSubscribedNode -->
+			<xs:enumeration value="19" />
+			<!-- serviceSubscribedNode -->
 			<xs:enumeration value="20" />
 			<!-- statsCollect -->
 			<xs:enumeration value="21" />
@@ -259,42 +259,42 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:documentation></xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:integer">
-		    <!-- ACCEPTED     -->
+		    	<!-- ACCEPTED     -->
 			<xs:enumeration value="1000" />
 			<!-- ACCEPTED for nonBlockingRequestSynch -->
 			<xs:enumeration value="1001" />
 			<!-- ACCEPTED for nonBlockingRequestAsynch -->
 			<xs:enumeration value="1002" />
 			<!-- OK           -->
-            <xs:enumeration value="2000" />
-            <!-- CREATED      -->
-            <xs:enumeration value="2001" />         
-            <!-- DELETED      -->
-            <xs:enumeration value="2002" />
-            <!-- UPDATED      -->
-            <xs:enumeration value="2004" />
+			<xs:enumeration value="2000" />
+			<!-- CREATED      -->
+			<xs:enumeration value="2001" />         
+			<!-- DELETED      -->
+			<xs:enumeration value="2002" />
+			<!-- UPDATED      -->
+			<xs:enumeration value="2004" />
   
   
-            <!-- BAD_REQUEST  -->
-            <xs:enumeration value="4000" />
+			<!-- BAD_REQUEST  -->
+			<xs:enumeration value="4000" />
 			<!-- RELEASE_VERSION_NOT_SUPPORTED -->
 			<xs:enumeration value="4001" />
-            <!-- NOT_FOUND    -->
-            <xs:enumeration value="4004" />            
-            <!-- OPERATION_NOT_ALLOWED  -->
-            <xs:enumeration value="4005" />            
-            <!-- REQUEST_TIMEOUT  -->
-            <xs:enumeration value="4008" />
+			<!-- NOT_FOUND    -->
+			<xs:enumeration value="4004" />            
+			<!-- OPERATION_NOT_ALLOWED  -->
+			<xs:enumeration value="4005" />            
+			<!-- REQUEST_TIMEOUT  -->
+			<xs:enumeration value="4008" />
 			<!-- UNSUPPORTED_MEDIA_TYPE  -->
 			<xs:enumeration value="4015" />
-            <!-- SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE -->
-            <xs:enumeration value="4101" />                
+			<!-- SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE -->
+			<xs:enumeration value="4101" />                
 			<!-- ORIGINATOR_HAS_NO_PRIVILEGE    -->
-            <xs:enumeration value="4103" />              
-            <!-- GROUP_REQUEST_IDENTIFIER_EXISTS  -->
-            <xs:enumeration value="4104" />              
-            <!-- CONFLICT                  -->
-            <xs:enumeration value="4105" />      
+			<xs:enumeration value="4103" />              
+			<!-- GROUP_REQUEST_IDENTIFIER_EXISTS  -->
+			<xs:enumeration value="4104" />              
+			<!-- CONFLICT                  -->
+			<xs:enumeration value="4105" />      
 			<!-- ORIGINATOR_HAS_NOT_REGISTERED -->
 			<xs:enumeration value="4106" /> 
 			<!-- SECURITY_ASSOCIATION_REQUIRED -->
@@ -324,25 +324,25 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- APP_RULE_VALIDATION_FAILED -->
 			<xs:enumeration value="4126" /> 
 			
-			   
+			
 			<!-- INTERNAL_SERVER_ERROR     -->
-            <xs:enumeration value="5000" />              
-            <!-- NOT_IMPLEMENTED           -->
-            <xs:enumeration value="5001" />
-            <!-- TARGET_NOT_REACHABLE      -->
-            <xs:enumeration value="5103" />             
+			<xs:enumeration value="5000" />              
+			<!-- NOT_IMPLEMENTED           -->
+			<xs:enumeration value="5001" />
+			<!-- TARGET_NOT_REACHABLE      -->
+			<xs:enumeration value="5103" />             
 			<!-- RECEIVER_HAS_NO_PRIVILEGE -->
-            <xs:enumeration value="5105" />            
-            <!-- ALREADY_EXISTS            -->
-            <xs:enumeration value="5106" />    
-            <!-- TARGET_NOT_SUBSCRIBABLE   -->
-            <xs:enumeration value="5203" />            
-            <!-- SUBSCRIPTION_VERIFICATION_INITIATION_FAILED   -->
-            <xs:enumeration value="5204" />            
-            <!-- SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE     -->
-            <xs:enumeration value="5205" />            
+			<xs:enumeration value="5105" />            
+			<!-- ALREADY_EXISTS            -->
+			<xs:enumeration value="5106" />    
+			<!-- TARGET_NOT_SUBSCRIBABLE   -->
+			<xs:enumeration value="5203" />            
+			<!-- SUBSCRIPTION_VERIFICATION_INITIATION_FAILED   -->
+			<xs:enumeration value="5204" />            
+			<!-- SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE     -->
+			<xs:enumeration value="5205" />            
 			<!-- NON_BLOCKING_SYNCH_REQUEST_NOT_SUPPORTED    -->
-            <xs:enumeration value="5206" />    
+			<xs:enumeration value="5206" />    
 			<!-- NOT_ACCEPTABLE                         -->
 			<xs:enumeration value="5207" />
 			<!-- DISCOVERY_DENIED_BY_IPE                -->
@@ -360,29 +360,29 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 			<!-- EXTERNAL_OBJECT_NOT_REACHABLE          -->
-            <xs:enumeration value="6003" />              
-            <!-- EXTERNAL_OBJECT_NOT_FOUND              -->
-            <xs:enumeration value="6005" />  
-            <!-- MAX_NUMBER_OF_MEMBER_EXCEEDED          -->
-            <xs:enumeration value="6010" />              
-            <!-- MGMT_SESSION_CANNOT_BE_ESTABLISHED     -->
-            <xs:enumeration value="6020" />               
-            <!-- MGMT_SESSION_ESTABLISHMENT_TIMEOUT     -->
-            <xs:enumeration value="6021" />               
-            <!-- INVALID_CMDTYPE                        -->
-            <xs:enumeration value="6022" />               
-            <!-- INVALID_ARGUMENTS                      -->
-            <xs:enumeration value="6023" />               
-            <!-- INSUFFICIENT_ARGUMENTS                 -->
-            <xs:enumeration value="6024" />               
-            <!-- MGMT_ CONVERSION_ERROR                 -->
-            <xs:enumeration value="6025" />               
-            <!-- MGMT_ CANCELLATION_FAILED              -->
-            <xs:enumeration value="6026" />               
-            <!-- ALREADY_COMPLETE                       -->
-            <xs:enumeration value="6028" />               
-            <!-- MGMT_COMMAND_NOT_CANCELLABLE           -->
-            <xs:enumeration value="6029" />                
+			<xs:enumeration value="6003" />              
+			<!-- EXTERNAL_OBJECT_NOT_FOUND              -->
+			<xs:enumeration value="6005" />  
+			<!-- MAX_NUMBER_OF_MEMBER_EXCEEDED          -->
+			<xs:enumeration value="6010" />              
+			<!-- MGMT_SESSION_CANNOT_BE_ESTABLISHED     -->
+			<xs:enumeration value="6020" />               
+			<!-- MGMT_SESSION_ESTABLISHMENT_TIMEOUT     -->
+			<xs:enumeration value="6021" />               
+			<!-- INVALID_CMDTYPE                        -->
+			<xs:enumeration value="6022" />               
+			<!-- INVALID_ARGUMENTS                      -->
+			<xs:enumeration value="6023" />               
+			<!-- INSUFFICIENT_ARGUMENTS                 -->
+			<xs:enumeration value="6024" />               
+			<!-- MGMT_ CONVERSION_ERROR                 -->
+			<xs:enumeration value="6025" />               
+			<!-- MGMT_ CANCELLATION_FAILED              -->
+			<xs:enumeration value="6026" />               
+			<!-- ALREADY_COMPLETE                       -->
+			<xs:enumeration value="6028" />               
+			<!-- MGMT_COMMAND_NOT_CANCELLABLE           -->
+			<xs:enumeration value="6029" />                
 		</xs:restriction>
 	</xs:simpleType>
 	
@@ -391,18 +391,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		<xs:annotation>
 			<xs:documentation>Used for request Status in the &lt;request&gt; resource</xs:documentation>
 		</xs:annotation>
-        <xs:restriction base="xs:integer">
-            <!-- COMPLETED -->
-            <xs:enumeration value="1" />
-            <!-- FAILED -->
-            <xs:enumeration value="2" />
-            <!-- PENDING -->
-            <xs:enumeration value="3" />
-            <!-- FORWARDED -->
-            <xs:enumeration value="4" />      	
-        	<!-- PARTIALLY_COMPLETED -->
-        	<xs:enumeration value="5" />
-        </xs:restriction>
+		<xs:restriction base="xs:integer">
+			<!-- COMPLETED -->
+			<xs:enumeration value="1" />
+			<!-- FAILED -->
+			<xs:enumeration value="2" />
+			<!-- PENDING -->
+			<xs:enumeration value="3" />
+			<!-- FORWARDED -->
+			<xs:enumeration value="4" />      	
+			<!-- PARTIALLY_COMPLETED -->
+			<xs:enumeration value="5" />
+		</xs:restriction>
 	</xs:simpleType>
 
 	<xs:simpleType name="memberType">