diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 5c306823d6df39d4b78060c456422cd57ffbdb65..09f8a22a21dc9b7c80923532af316712dd95194e 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -3705,6 +3705,8 @@ module OneM2M_Functions {
 					v_myResource.cSEBase.creationTime := "20171231T012345";
 					v_myResource.cSEBase.lastModifiedTime := v_myResource.cSEBase.creationTime;		
 					v_myResource.cSEBase.cseType := vc_cseType;
+					v_myResource.cSEBase.resourceID := f_resourceIdCleaner(v_myResource.cSEBase.resourceID);
+					v_myResource.cSEBase.pointOfAccess := {f_getLocalPoA(vc_cseSimuDesc.mccPortIn, "")};
 					}	    
 				}else if(p_resourceType == int16 and ispresent(p_resource)) {			//RemoteCSE
 					if(ischosen(p_resource.remoteCSE)){
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index f9fbcf50f707707372798a01604f99288abc3880..9fc529175ea162447f96a41e35bb9df5aebc75a6 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -17,7 +17,7 @@ module OneM2M_Templates {
 	import from OneM2M_Types all;
 	import from OneM2M_TypesAndValues all;
 	import from OneM2M_Pixits all;
-	import from OneM2M_Functions all;
+	//import from OneM2M_Functions all;
 	
 	import from OneM2M_Types_3GPP_T8 all;
 
@@ -2679,7 +2679,7 @@ module OneM2M_Templates {
 		template (value) CSEBase_optional m_contentCSEBase(in CseSimuComponentDesc p_componentDesc):= {
 			resourceName := p_componentDesc.cseName,//O
 			resourceType := int5,
-			resourceID := f_resourceIdCleaner(p_componentDesc.cseResourceId),
+			resourceID := p_componentDesc.cseResourceId,
 			parentID := "",//Following TS-0001, it must be NULL. Set to a value for Codec to set it to null
 			creationTime := omit,
 			lastModifiedTime := omit,
@@ -2688,7 +2688,7 @@ module OneM2M_Templates {
 			cseType := omit,
 			cSE_ID := p_componentDesc.cseId,
 			supportedResourceType := p_componentDesc.supportedResourceType,
-			pointOfAccess := {f_getLocalPoA(p_componentDesc.mccPortIn, "")},
+			pointOfAccess := {"NotInitialized"},
 			nodeLink := omit,
 			dynamicAuthorizationConsultationIDs := omit,
 			contentSerialization := omit,