diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 2db909902fdb0b354ff46719421721acbe5c7981..589e2d92bbe6ec41acbe9d59bd4b68e612dd6c35 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -9894,7 +9894,9 @@ module OneM2M_PermutationFunctions {
 				function f_CSE_ANNC_CRE_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var integer v_aeIndex := -1;
-					var integer v_aEAnncIndex := -1;
+					var integer v_resourceIndex := -1;
+					var integer v_parentIndex := -1;
+					var RequestPrimitive v_request;
 					var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
 					
 					v_create.primitiveContent.aE.announceTo := {PX_TS_CSE1.cseId};
@@ -9908,17 +9910,37 @@ module OneM2M_PermutationFunctions {
 					// Register the CSE
 					f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getLocalPoA()}));
 					
+					v_parentIndex := vc_localRemoteCseIndex;
+					
 					//Preamble
 					vc_ae1.start(f_cse_createResource(int2,v_create));
-					v_aEAnncIndex := f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
+					f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
 					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
 					
 					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
 					
+					v_resourceIndex := v_aeIndex;
+					
 					// Test Body
-					vc_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_aeIndex));
+					if (p_resourceType == int4) {
+						v_create := m_createContainerBase;
+						v_create.primitiveContent.container.announceTo := {PX_TS_CSE1.cseId};
+						vc_ae1.start(f_cse_createResource(int3,v_create, v_aeIndex));
+						v_parentIndex := f_cse_announcementProcedure_createHandler(mw_createContainerAnnc(), -, -);
+						f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+						v_resourceIndex := f_getLatestResourceIndex(vc_ae1);
+					} else if (p_resourceType == int30) {
+						v_create := m_createTimeSeriesBase;
+						v_create.primitiveContent.timeSeries.announceTo := {PX_TS_CSE1.cseId};
+						vc_ae1.start(f_cse_createResource(int29,v_create, v_aeIndex));
+						v_parentIndex := f_cse_announcementProcedure_createHandler(mw_createTimeSeriesAnnc(), -, -);
+						f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+						v_resourceIndex := f_getLatestResourceIndex(vc_ae1);
+					}
+					
+					vc_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_resourceIndex));
 					
-					f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, -);					
+					f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, v_parentIndex);					
 					
 					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
 
@@ -9993,6 +10015,8 @@ module OneM2M_PermutationFunctions {
 				function f_CSE_ANNC_CRE_006(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var integer v_aeIndex := -1;
+					var integer v_resourceIndex := -1;
+					var integer v_parentIndex := -1;
 					var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
 					
 					// Test control
@@ -10010,10 +10034,28 @@ module OneM2M_PermutationFunctions {
 					
 					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
 
+					v_resourceIndex := v_aeIndex;
+					
 					// Test Body
-					vc_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_aeIndex));
+					if (p_resourceType == int4) {
+						v_create := m_createContainerBase;
+						v_create.primitiveContent.container.announceTo := {PX_TS_CSE1.cseId};
+						vc_ae1.start(f_cse_createResource(int3,v_create, v_aeIndex));
+						v_parentIndex := f_cse_announcementProcedure_createHandler(mw_createContainerAnnc(), -, -);
+						f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+						v_resourceIndex := f_getLatestResourceIndex(vc_ae1);
+					} else if (p_resourceType == int30) {
+						v_create := m_createTimeSeriesBase;
+						v_create.primitiveContent.timeSeries.announceTo := {PX_TS_CSE1.cseId};
+						vc_ae1.start(f_cse_createResource(int29,v_create, v_aeIndex));
+						v_parentIndex := f_cse_announcementProcedure_createHandler(mw_createTimeSeriesAnnc(), -, -);
+						f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+						v_resourceIndex := f_getLatestResourceIndex(vc_ae1);
+					}
+
+					vc_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_resourceIndex));
 
-					f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, vc_localRemoteCseIndex);
+					f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, v_parentIndex);
 										
 					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
 
@@ -10074,7 +10116,8 @@ module OneM2M_PermutationFunctions {
 				function f_CSE_ANNC_CRE_008(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var integer v_aeIndex := -1;
-					var integer v_aEAnncIndex := -1;
+					var integer v_resourceIndex := -1;
+					var integer v_parentIndex := -1;
 					var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
 					
 					v_create.primitiveContent.aE.announceTo := {PX_TS_CSE1.cseId};
@@ -10091,14 +10134,32 @@ module OneM2M_PermutationFunctions {
 					f_checkCseSimuStatus();
 					
 					vc_ae1.start(f_cse_createResource(int2,v_create));
-					v_aEAnncIndex := f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
+					f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
 					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
 					
 					v_aeIndex := f_getLatestResourceIndex(vc_ae1);
 
+					v_resourceIndex := v_aeIndex;
+					
 					// Test Body
-					vc_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_aeIndex));
-					f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, -);
+					if (p_resourceType == int4) {
+						v_create := m_createContainerBase;
+						v_create.primitiveContent.container.announceTo := {PX_TS_CSE1.cseId};
+						vc_ae1.start(f_cse_createResource(int3,v_create, v_aeIndex));
+						v_parentIndex := f_cse_announcementProcedure_createHandler(mw_createContainerAnnc(), -, -);
+						f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+						v_resourceIndex := f_getLatestResourceIndex(vc_ae1);
+					} else if (p_resourceType == int30) {
+						v_create := m_createTimeSeriesBase;
+						v_create.primitiveContent.timeSeries.announceTo := {PX_TS_CSE1.cseId};
+						vc_ae1.start(f_cse_createResource(int29,v_create, v_aeIndex));
+						v_parentIndex := f_cse_announcementProcedure_createHandler(mw_createTimeSeriesAnnc(), -, -);
+						f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+						v_resourceIndex := f_getLatestResourceIndex(vc_ae1);
+					}
+
+					vc_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_resourceIndex));
+					f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, v_parentIndex);
 					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
 					
 					// Postamble