diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index b4ece32eddd70e4579dd6695319fd6897cabf019..518a2eb3d5dbc83db96f2887da08492ff393bbfb 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -4816,7 +4816,13 @@ module OneM2M_Functions {
 			}
 			if(ischosen(p_contentResource.genericInterworkingService_invalid)) {
 				return p_contentResource.genericInterworkingService_invalid.resourceName;
-			}			
+			}		
+			if(ischosen(p_contentResource.timeSeries)) {
+				return p_contentResource.timeSeries.resourceName;
+			}	
+			if(ischosen(p_contentResource.timeSeriesInstance)) {
+				return p_contentResource.timeSeriesInstance.resourceName;
+			}
 			log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
 			
 			return "resourceNameNotFound";
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index caa64ef26dc0eb349882e154a3988e30a89adb7f..09e3854a46680ab14010b21b9fceed4b6bc3d966 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -881,7 +881,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
 						
-						v_createRequestTimeSeries.primitiveContent.container.maxByteSize := c_maxByteSize;
+						v_createRequestTimeSeries.primitiveContent.timeSeries.maxByteSize := c_maxByteSize;
 						v_createRequestTimeSeriesInstance1.primitiveContent.timeSeriesInstance.content := c_primitiveContent1;	//ContentInstance 1
 						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.content := c_primitiveContent2;	//ContentInstance 2
 						v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.resourceName := c_defaultTimeSeriesInstanceResourceName & "2";	//ContentInstance 2