diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 7e9a79332ab06bb393ba0053326f1f960b95bf51..61cb4c06f8b6774b0b2b9fdc26ce1b39f665dba9 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2343,6 +2343,18 @@ module OneM2M_Functions {
 			if(ischosen(p_contentResource.cSEBase)) {
 				return f_resourceIdCleaner(p_contentResource.cSEBase.resourceID);
 			}
+			if(ischosen(p_contentResource.m2mServiceSubscriptionProfile)) {
+				return p_contentResource.m2mServiceSubscriptionProfile.resourceName;
+			}
+			if(ischosen(p_contentResource.node)) {
+				return p_contentResource.node.resourceName;
+			}
+			if(ischosen(p_contentResource.statsConfig)) {
+				return p_contentResource.statsConfig.resourceName;
+			}
+			if(ischosen(p_contentResource.statsCollect)) {
+				return p_contentResource.statsCollect.resourceName;
+			}
 
 			log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
 			
@@ -2391,6 +2403,19 @@ module OneM2M_Functions {
 			if(ischosen(p_contentResource.cSEBase)) {
 				return p_contentResource.cSEBase.resourceName;
 			}
+			if(ischosen(p_contentResource.m2mServiceSubscriptionProfile)) {
+				return p_contentResource.m2mServiceSubscriptionProfile.resourceName;
+			}
+			if(ischosen(p_contentResource.node)) {
+				return p_contentResource.node.resourceName;
+			}
+			if(ischosen(p_contentResource.statsConfig)) {
+				return p_contentResource.statsConfig.resourceName;
+			}
+			if(ischosen(p_contentResource.statsCollect)) {
+				return p_contentResource.statsCollect.resourceName;
+			}
+			
 			log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
 			
 			return "resourceNameNotFound";