diff --git a/CDT-enumerationTypes-v0_8_0.xsd b/CDT-enumerationTypes-v0_8_0.xsd
index 1f7c3bb9d2df85b8c7ac1656d7754d4c5de864eb..14920fb92b414004990fdd3c67b55dcccab5234e 100644
--- a/CDT-enumerationTypes-v0_8_0.xsd
+++ b/CDT-enumerationTypes-v0_8_0.xsd
@@ -224,7 +224,79 @@ 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">
-			<xs:enumeration value="22" />
+		    <!-- ACCEPTED     -->
+			<xs:enumeration value="1000" />
+			<!-- OK           -->
+            <xs:enumeration value="2000" />
+            <!-- CREATED      -->
+            <xs:enumeration value="2001" />         
+            <!-- DELETED      -->
+            <xs:enumeration value="2002" />
+            <!-- CHANGED      -->
+            <xs:enumeration value="2004" />
+            <!-- BAD_REQUEST  -->
+            <xs:enumeration value="4000" />            
+            <!-- NOT_FOUND    -->
+            <xs:enumeration value="4004" />            
+            <!-- OPERATION_NOT_ALLOWED  -->
+            <xs:enumeration value="4005" />            
+            <!-- REQUEST_TIMEOUT  -->
+            <xs:enumeration value="4008" />            
+            <!-- SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE-->
+            <xs:enumeration value="4101" />            
+            <!-- CONTENTS_UNACCEPTABLE  -->
+            <xs:enumeration value="4102" />              
+            <!-- ACCESS_DENIED    -->
+            <xs:enumeration value="4103" />              
+            <!-- GROUP_REQUEST_IDENTIFIER_EXISTS  -->
+            <xs:enumeration value="4104" />              
+            <!-- CONFLICT                  -->
+            <xs:enumeration value="4105" />              
+            <!-- INTERNAL_SERVER_ERROR     -->
+            <xs:enumeration value="5000" />              
+            <!-- NOT_IMPLEMENTED           -->
+            <xs:enumeration value="5001" />
+            <!-- TARGET_NOT_REACHABLE      -->
+            <xs:enumeration value="5103" />             
+            <!-- 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" />            
+            <!-- NON_BLOCKING_REQUEST_NOT_SUPPORTED     -->
+            <xs:enumeration value="5206" />            
+            <!-- EXTERNAL_OBJECT_NOT_REACHABLE          -->
+            <xs:enumeration value="6003" />              
+            <!-- EXTERNAL_OBJECT_NOT_FOUND              -->
+            <xs:enumeration value="6005" />  
+            <!-- TODO: Typo in the table in TS-0004     -->           
+            <!-- MAX_NUMBER_OF_MEMBER_EXCEEDED          -->
+            <xs:enumeration value="6010" />              
+            <!-- MEMBER_TYPE_INCONSISTENT               -->
+            <xs:enumeration value="6011" />               
+            <!-- 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_ CANCELATION_FAILURE              -->
+            <xs:enumeration value="6026" />               
+            <!-- ALREADY_COMPLETE                       -->
+            <xs:enumeration value="6028" />               
+            <!-- MGMT_COMMAND_NOT_CANCELLABLE           -->
+            <xs:enumeration value="6029" />                
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -647,26 +719,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction>
 	</xs:simpleType>
 	
-	<xs:simpleType name="accessControlOperation">
-        <xs:annotation>
-            <xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="xs:integer">
-            <!-- Create -->
-            <xs:enumeration value="1" />
-            <!-- Retrieve -->
-            <xs:enumeration value="2" />
-            <!-- Update -->
-            <xs:enumeration value="4" />
-            <!-- Delete -->
-            <xs:enumeration value="8" />
-            <!-- Notify -->
-            <xs:enumeration value="16" />
-            <!-- Discover -->
-            <xs:enumeration value="32" />
-        </xs:restriction>
-    </xs:simpleType>
-	
     <xs:simpleType name="SRole-ID">
         <xs:restriction base="xs:token">
             <!-- Software Management -->