diff --git a/v3_21_0/CDT-enumerationTypes-v3_21_0.xsd b/v3_21_0/CDT-enumerationTypes-v3_21_0.xsd
index 0ef043354849b33bbba2202d7af6f0efdfd59177..4cada5321786d335f62765ea0f214df05a816d01 100644
--- a/v3_21_0/CDT-enumerationTypes-v3_21_0.xsd
+++ b/v3_21_0/CDT-enumerationTypes-v3_21_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" />
@@ -142,6 +142,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- contentInstanceAnnc -->
 			<xs:enumeration value="10004" />
 			<!-- groupAnnc -->
+			<xs:enumeration value="10005" />
+			<!-- CSEBaseAnnc -->
 			<xs:enumeration value="10009" />
 			<!-- locationPolicyAnnc -->
 			<xs:enumeration value="10010" />
diff --git a/v3_22_0/CDT-enumerationTypes-v3_22_0.xsd b/v3_22_0/CDT-enumerationTypes-v3_22_0.xsd
index 0ef043354849b33bbba2202d7af6f0efdfd59177..4cada5321786d335f62765ea0f214df05a816d01 100644
--- a/v3_22_0/CDT-enumerationTypes-v3_22_0.xsd
+++ b/v3_22_0/CDT-enumerationTypes-v3_22_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" />
@@ -142,6 +142,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- contentInstanceAnnc -->
 			<xs:enumeration value="10004" />
 			<!-- groupAnnc -->
+			<xs:enumeration value="10005" />
+			<!-- CSEBaseAnnc -->
 			<xs:enumeration value="10009" />
 			<!-- locationPolicyAnnc -->
 			<xs:enumeration value="10010" />
diff --git a/v3_23_0/CDT-enumerationTypes-v3_23_0.xsd b/v3_23_0/CDT-enumerationTypes-v3_23_0.xsd
index 5d2dba11b01456ec5c0dbe275643d3054512a3d4..4a5553c3794892a803ef788cab6a9c5ff6b15016 100644
--- a/v3_23_0/CDT-enumerationTypes-v3_23_0.xsd
+++ b/v3_23_0/CDT-enumerationTypes-v3_23_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" />
@@ -142,6 +142,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- contentInstanceAnnc -->
 			<xs:enumeration value="10004" />
 			<!-- groupAnnc -->
+			<xs:enumeration value="10005" />
+			<!-- CSEBaseAnnc -->
 			<xs:enumeration value="10009" />
 			<!-- locationPolicyAnnc -->
 			<xs:enumeration value="10010" />
diff --git a/v3_24_0/CDT-enumerationTypes-v3_24_0.xsd b/v3_24_0/CDT-enumerationTypes-v3_24_0.xsd
index b2b2e0c89ad3d6e91c1195d1364c6207b39ae39a..a2474364850fc75212a8218ff4e1e1839c38c344 100644
--- a/v3_24_0/CDT-enumerationTypes-v3_24_0.xsd
+++ b/v3_24_0/CDT-enumerationTypes-v3_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" />
@@ -142,6 +142,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- contentInstanceAnnc -->
 			<xs:enumeration value="10004" />
 			<!-- groupAnnc -->
+			<xs:enumeration value="10005" />
+			<!-- CSEBaseAnnc -->
 			<xs:enumeration value="10009" />
 			<!-- locationPolicyAnnc -->
 			<xs:enumeration value="10010" />
diff --git a/v3_25_0/CDT-enumerationTypes-v3_25_0.xsd b/v3_25_0/CDT-enumerationTypes-v3_25_0.xsd
index b2b2e0c89ad3d6e91c1195d1364c6207b39ae39a..a2474364850fc75212a8218ff4e1e1839c38c344 100644
--- a/v3_25_0/CDT-enumerationTypes-v3_25_0.xsd
+++ b/v3_25_0/CDT-enumerationTypes-v3_25_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" />
@@ -142,6 +142,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- contentInstanceAnnc -->
 			<xs:enumeration value="10004" />
 			<!-- groupAnnc -->
+			<xs:enumeration value="10005" />
+			<!-- CSEBaseAnnc -->
 			<xs:enumeration value="10009" />
 			<!-- locationPolicyAnnc -->
 			<xs:enumeration value="10010" />
diff --git a/v3_26_0/CDT-enumerationTypes-v3_26_0.xsd b/v3_26_0/CDT-enumerationTypes-v3_26_0.xsd
index b2b2e0c89ad3d6e91c1195d1364c6207b39ae39a..a2474364850fc75212a8218ff4e1e1839c38c344 100644
--- a/v3_26_0/CDT-enumerationTypes-v3_26_0.xsd
+++ b/v3_26_0/CDT-enumerationTypes-v3_26_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" />
@@ -142,6 +142,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- contentInstanceAnnc -->
 			<xs:enumeration value="10004" />
 			<!-- groupAnnc -->
+			<xs:enumeration value="10005" />
+			<!-- CSEBaseAnnc -->
 			<xs:enumeration value="10009" />
 			<!-- locationPolicyAnnc -->
 			<xs:enumeration value="10010" />
diff --git a/v3_27_0/CDT-enumerationTypes-v3_27_0.xsd b/v3_27_0/CDT-enumerationTypes-v3_27_0.xsd
index b2b2e0c89ad3d6e91c1195d1364c6207b39ae39a..a2474364850fc75212a8218ff4e1e1839c38c344 100644
--- a/v3_27_0/CDT-enumerationTypes-v3_27_0.xsd
+++ b/v3_27_0/CDT-enumerationTypes-v3_27_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" />
@@ -142,6 +142,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- contentInstanceAnnc -->
 			<xs:enumeration value="10004" />
 			<!-- groupAnnc -->
+			<xs:enumeration value="10005" />
+			<!-- CSEBaseAnnc -->
 			<xs:enumeration value="10009" />
 			<!-- locationPolicyAnnc -->
 			<xs:enumeration value="10010" />
diff --git a/v3_28_0/CDT-enumerationTypes-v3_28_0.xsd b/v3_28_0/CDT-enumerationTypes-v3_28_0.xsd
index b2b2e0c89ad3d6e91c1195d1364c6207b39ae39a..a2474364850fc75212a8218ff4e1e1839c38c344 100644
--- a/v3_28_0/CDT-enumerationTypes-v3_28_0.xsd
+++ b/v3_28_0/CDT-enumerationTypes-v3_28_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" />
@@ -142,6 +142,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- contentInstanceAnnc -->
 			<xs:enumeration value="10004" />
 			<!-- groupAnnc -->
+			<xs:enumeration value="10005" />
+			<!-- CSEBaseAnnc -->
 			<xs:enumeration value="10009" />
 			<!-- locationPolicyAnnc -->
 			<xs:enumeration value="10010" />