diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 2b7f452d3cea317fd08f51f06e838a10edf4018a..85805b89023de4202b14c6b864fa3197f583ebc3 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- *              $Id: OneM2M_Types.ttcn 327 2017-07-26 06:25:46Z reinaortega $
+ *              $Id: OneM2M_Types.ttcn 329 2017-07-26 07:03:27Z reinaortega $
  *  @desc       OneM2M data types module 
  *
  */
@@ -7790,6 +7790,13 @@ group InvalidTypes {
 
 	group OtherTypes {
 		
+		type enumerated Configurations {
+			e_cf01,
+			e_cf02,
+			e_cf03,
+			e_cf04
+		};
+		
 		type NhURI ParentID;
     	
 		type record MyResource {
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index d45df2f1845b2832c5ce23b0147034a75d1e3374..49821c5b2ac8a1abde629487f6674d58a70dd104 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
- *              $Id: OneM2M_TypesAndValues.ttcn 324 2017-07-24 16:16:08Z reinaortega $
+ *              $Id: OneM2M_TypesAndValues.ttcn 329 2017-07-26 07:03:27Z reinaortega $
  *  @desc       Module containing types and values for oneM2M
  *
  */
@@ -106,19 +106,7 @@ module OneM2M_TypesAndValues {
 	const XSD.Integer c_UDNDi   := 60;
 	const XSD.Integer c_CUDNDi   := 61; 
 	const XSD.Integer c_RUDNDi   := 62; 
-	const XSD.Integer c_CRUDNDi   := 63;
-	
-	type NhURI ParentID;
-	type record length(0 .. infinity) of RequestPrimitive RequestPrimitiveList;
-	type record length(1 .. infinity) of RequestPrimitiveList RequestPrimitiveMatrix;
-	
-	type enumerated Configurations {
-		e_cf01,
-		e_cf02,
-		e_cf03,
-		e_cf04
-	};
-	
+	const XSD.Integer c_CRUDNDi   := 63;	
 	
 } 
 // end of module
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 8459a0e9702446b40c4f3da105d46b90c7d7b6a4..dc5a5c013cc83d756ac0b2a5a937e402dd390a99 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- *              $Id: OneM2M_Testcases.ttcn 328 2017-07-26 06:48:38Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 329 2017-07-26 07:03:27Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -2101,7 +2101,6 @@ module OneM2M_Testcases {
 						// Local variables
 						var template RequestPrimitive v_createRequest := m_createStatsConfigBase;
 						var ResponsePrimitive v_responsePrimitive;
-						var RequestPrimitiveMatrix v_requestPrimitivematrix;
 						var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
 						
 						v_createRequest.primitiveContent.statsConfig.resourceName := omit;