diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 39e778531ef0f4174a029dc754a864cafc441731..4c89b0d841f9c6964967ca5b03aca04078b47a07 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -8446,6 +8446,48 @@ with {
   variant "element";  
 };
 
+type record EvalCriteria //TODO Manually added until XSD files are updated
+{
+	XSD.NCName  subject,
+	Operation   operator, // see type enumerated Operation
+	XSD.Integer threshold
+}
+
+ type record ActionInput //TODO Manually added until XSD files are updated
+{
+	XSD.NCName contentString optional,
+	XSD.AnyURI resourceID optional,
+	XSD.AnyURI resourceAttributeID optional
+}
+
+group softwareTypes {
+
+	//TODO To be removed/replaced by the type defined in XSDs- TS-0001, Table 9.6.76-2
+	type enumerated AggregatedSoftwareStatus
+	{
+		int0(0), //Uninitialized 
+		int1(1), //Successful
+		int2(2), //Failure
+		int3(3)  //In_Process
+	}
+
+	type enumerated SoftwareOperation
+	{
+		int1(1), //install
+		int2(2), //uninstall
+		int3(3), //activate
+		int4(4)  //deactivate
+	}
+    
+	type enumerated EvalMode
+	{
+		int0(0), //off
+		int1(1), //once
+		int2(2), //periodic
+		int3(3)  //continuous
+	}
+} // End of group Software
+
 	}
 	with {
   encode "XML";