diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index baf3866a120918c336758ff7a00ff0b56f61b137..889883727496d9a1f7f089e2f708f4b0634789ee 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -6952,8 +6952,8 @@ module OneM2M_PermutationFunctions {
 		
 					// Test adapter configuration
 					// Register the CSE
-					f_cse_registerRemoteCse(m_createRemoteCSEBase);	
-		
+					f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getLocalPoA()}));
+					
 					//Preamble
 		
 					vc_ae1.start(f_cse_createResource(int2,v_create));					
@@ -6962,7 +6962,14 @@ module OneM2M_PermutationFunctions {
 		
 					v_aeIndex:= f_getLatestResourceIndex(vc_ae1);
 					
-					if(p_resourceType != int18) {
+					if (p_resourceType == int30) {
+							v_create := m_createTimeSeriesBase;
+							v_create.primitiveContent.timeSeries.announceTo := {vc_cseSimuDesc.cseId};
+							vc_ae1.start(f_cse_createResource(int29, v_create, v_aeIndex));					
+							f_cse_announcementProcedure_createHandler();		
+							f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+							v_parentIndex:= f_getLatestResourceIndex(vc_ae1);
+					} else if(p_resourceType != int18) {
 						v_parentIndex := v_aeIndex;//For resources that can have AE resource as parent
 					}