diff --git a/CDT-commonTypes-v0_8_0.xsd b/CDT-commonTypes-v0_8_0.xsd
index bbd95e73f5c51e1ba69b831366523394bb2dc970..1556920f3ba83c07eca220a88d84cd50a5b6749c 100644
--- a/CDT-commonTypes-v0_8_0.xsd
+++ b/CDT-commonTypes-v0_8_0.xsd
@@ -31,11 +31,24 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		<xs:restriction base="xs:dateTime" />
 	</xs:simpleType>
 
-	<!-- TODO: temp fix -->
+	<!-- TODO: Fix these -->
 	<xs:simpleType name="eventCat">
-		<xs:union memberTypes="m2m:stdEventCats "/>
+		<xs:union memberTypes="m2m:stdEventCats " />
 	</xs:simpleType>
 
+	<xs:simpleType name="eventCatWithDef">
+		<xs:union memberTypes="m2m:eventCat " />
+	</xs:simpleType>
+
+	<xs:simpleType name="listOfEventCat">
+		<list itemType="m2m:eventCat" />
+	</xs:simpleType>
+
+	<xs:simpleType name="listOfEventCatwithDef">
+		<list itemType="m2m:eventCatWithDef" />
+	</xs:simpleType>
+
+
 	<xs:simpleType name="extendedCrontab">
 		<xs:restriction base="xs:string">
 			<xs:pattern
@@ -425,7 +438,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:sequence>
 	</xs:complexType>
 
-	
+
 	<!-- TODO: check if m2m:ID is the correct data type for the following list elements or if xs:anyURI should be used (as used 
 		in access control rules) -->
 	<!-- "listOfM2MID" is a space separated list of CSE-IDs and/or AE-IDs (i.e. elements of data type m2m:ID" -->