diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 1a859336f141031b878951d46a0b89081ec01796..da046cae2793fad6dfbb0dad574f4ffa8c88bdb9 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -3503,6 +3503,21 @@ module OneM2M_Functions {
 							v_myResource.pollingChannel.expirationTime := "20301231T012345";
 						}
 					}				
+				} else if(p_resourceType == int29 and ispresent(p_resource)) { //TimeSeries
+					if(ischosen(p_resource.timeSeries)){
+						v_myResource.timeSeries := valueof(p_resource.timeSeries);
+						v_myResource.timeSeries.resourceID := "ts" & int2str(v_resourceIndex);
+						if(not(ispresent(p_resource.timeSeries.resourceName))) {
+							v_myResource.timeSeries.resourceName := "timeSeries" & int2str(v_resourceIndex);
+						}
+						v_myResource.timeSeries.resourceType := p_resourceType;
+						v_myResource.timeSeries.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
+						v_myResource.timeSeries.creationTime := fx_generateTimestamp();
+						v_myResource.timeSeries.lastModifiedTime := v_myResource.pollingChannel.creationTime;											
+						if(not(ispresent(p_resource.timeSeries.expirationTime))) {
+							v_myResource.timeSeries.expirationTime := "20301231T012345";
+						}
+					}				
 				}
 				return v_myResource;