diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 5cdfd6e84c05a8fad2a7eefe2b98101f43c312ee..c42fa4ed98d2ea09e07ac1fa17f22f4e9ccdb916 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -4100,7 +4100,8 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{{"maxByteSize", "100"}}}, //O
+			additions := {{{"mbs", {XSD.NonNegativeInteger := 100}}}}, //O
+			//additions := {{{"maxByteSize", "100"}}}, //O
 			applicability := int1
 		};
 		
@@ -4112,7 +4113,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{{"maxByteSize", "-100"}}}, //O
+			additions := {{{"mbs", {XSD.Integer := -100}}}}, //O
 			applicability := int1
 		};
 
@@ -4136,7 +4137,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{{"maxByteSize", "100"}}}, //O
+			additions := {{{"mbs", {XSD.NonNegativeInteger := 100}}}}, //O
 			applicability := int2
 		};
         
@@ -4148,7 +4149,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{{"resultContent", "4"}}}, //O
+			additions := {{{"rcn", {XSD.Integer := 4}}}}, //O
 			applicability := int1
 		};
         
@@ -4160,7 +4161,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{{"resultContent", "4"}}}, //O
+			additions := {{{"rcn", {XSD.Integer := 4}}}}, //O
 			applicability := int2
 		};
         
@@ -4172,7 +4173,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{{"resultContent", "4"}}}, //O
+			additions := {{{"rcn", {XSD.Integer := 4}}}}, //O
 			applicability := int2
 		};        
 		
@@ -4184,7 +4185,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{{"resultContent", "1"}}}, //O
+			additions := {{{"rcn", {XSD.Integer := 1}}}}, //O
 			applicability := int1
 		};
         
@@ -4196,7 +4197,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{{"resultContent", "1"}}}, //O
+			additions := {{{"rcn", {XSD.Integer := 1}}}}, //O
 			applicability := int2
 		};
 
@@ -4208,7 +4209,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{{"resultContent"}}}, //O
+			additions := {{{"rcn"}}}, //O
 			applicability := int1
 		};
 		
@@ -4220,7 +4221,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{{"releaseVersionIndicator", "3"}}}, //O
+			additions := {{{"rvi", {XSD.String := "3"}}}}, //O
 			applicability := int1
 		};
 		
@@ -4232,7 +4233,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			deletions := {"requestIdentifier"}, //O
+			deletions := {"rqi"}, //O
 			applicability := int1
 		};
 		
@@ -4244,8 +4245,8 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{{"maxByteSize", "100"}}}, //O
-			deletions := {"maxByteSize"}, //O
+			additions := {{{"mbs", {XSD.NonNegativeInteger := 100}}}}, //O
+			deletions := {"mbs"}, //O
 			applicability := int1
 		};
 		
@@ -4257,7 +4258,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			deletions := {"maxByteSize"}, //O
+			deletions := {"mbs"}, //O
 			applicability := int1
 		};
 		
@@ -4269,7 +4270,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			deletions := {"maxByteSize"}, //O
+			deletions := {"mbs"}, //O
 			applicability := int2
 		};
 		
@@ -4281,7 +4282,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			deletions := {"primitiveContent"}, //O
+			deletions := {"pc"}, //O
 			applicability := int2
 		};
 		
@@ -4293,7 +4294,7 @@ module OneM2M_Templates {
 			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{{"maxByteSize", "100"}}}, //O
+			additions := {{{"mbs", {XSD.NonNegativeInteger := 100}}}}, //O
 			applicability := int2
 		};
     	
@@ -4305,7 +4306,7 @@ module OneM2M_Templates {
             iDList := p_IDList, //M
             resourceTypes := {int3}, //O
             operations := {int1, int2, int3, int4, int5},//O
-            additions := {{{"resultContent", "1"}}}, //O
+            additions := {{{"rcn", {XSD.Integer := 1}}}}, //O
             applicability := int2
         };
         
@@ -4317,7 +4318,7 @@ module OneM2M_Templates {
             iDList := p_IDList, //M
             resourceTypes := {int3}, //O
             operations := {int1, int2, int3, int4, int5},//O
-            deletions := {"resultContent"}, //O
+            deletions := {"rcn"}, //O
             applicability := int2
         };        
         
diff --git a/LibOneM2M/oneM2M_Types b/LibOneM2M/oneM2M_Types
index 1da00eb4a6c912fe3354fd5ab5bc24da92ddc3d9..af7a0093b851fd5a184d9cc2955c46bcbfe379d0 160000
--- a/LibOneM2M/oneM2M_Types
+++ b/LibOneM2M/oneM2M_Types
@@ -1 +1 @@
-Subproject commit 1da00eb4a6c912fe3354fd5ab5bc24da92ddc3d9
+Subproject commit af7a0093b851fd5a184d9cc2955c46bcbfe379d0