diff --git a/components/BASE/Release-1.0.0/openehr_base_100.bmm b/components/BASE/Release-1.0.0/openehr_base_100.bmm
index f935b1a..bfe97b1 100644
--- a/components/BASE/Release-1.0.0/openehr_base_100.bmm
+++ b/components/BASE/Release-1.0.0/openehr_base_100.bmm
@@ -70,7 +70,7 @@ packages = <
 			["identification"] = <
 				name = <"identification">
 				classes = <"OBJECT_REF", "OBJECT_ID", "UID", "LOCATABLE_REF", "PARTY_REF", "TERMINOLOGY_ID", 
-					"UID_BASED_ID", "GENERIC_ID", "ARCHETYPE_ID", "ARCHETYPE_HRID", "TEMPLATE_ID", "OBJECT_VERSION_ID", 
+					"UID_BASED_ID", "GENERIC_ID", "ARCHETYPE_ID", "TEMPLATE_ID", "OBJECT_VERSION_ID",
 					"HIER_OBJECT_ID", "VERSION_TREE_ID", "INTERNET_ID", "UUID", "ISO_OID"
 				>
 			>
diff --git a/components/BASE/Release-1.1.0/openehr_base_110.bmm b/components/BASE/Release-1.1.0/openehr_base_110.bmm
index 35d3847..8f79faf 100644
--- a/components/BASE/Release-1.1.0/openehr_base_110.bmm
+++ b/components/BASE/Release-1.1.0/openehr_base_110.bmm
@@ -72,7 +72,7 @@ packages = <
 				name = <"identification">
 				classes = <"OBJECT_REF", "OBJECT_ID", "UID", "LOCATABLE_REF", "PARTY_REF", "ACCESS_GROUP_REF",
 					"TERMINOLOGY_ID",
-					"UID_BASED_ID", "GENERIC_ID", "ARCHETYPE_ID", "ARCHETYPE_HRID", "TEMPLATE_ID", "OBJECT_VERSION_ID", 
+					"UID_BASED_ID", "GENERIC_ID", "ARCHETYPE_ID", "TEMPLATE_ID", "OBJECT_VERSION_ID",
 					"HIER_OBJECT_ID", "VERSION_TREE_ID", "INTERNET_ID", "UUID", "ISO_OID"
 				>
 			>
@@ -416,6 +416,7 @@ class_definitions = <
 			["namespace"] = (P_BMM_SINGLE_PROPERTY) <
 				name = <"namespace">
 				type = <"String">
+				is_mandatory = <True>
 			>
 			["type"] = (P_BMM_SINGLE_PROPERTY) <
 				name = <"type">
@@ -723,7 +724,6 @@ class_definitions = <
 					root_type = <"Hash">
 					generic_parameters = <"String", "RESOURCE_DESCRIPTION_ITEM">
 				>
-				cardinality = <|>=1|>
 			>
 		>
 	>
diff --git a/components/PROC/Release-1.0.0/openehr_proc_task_planning_100.bmm b/components/PROC/Release-1.0.0/openehr_proc_task_planning_100.bmm
index d3f3c22..2e3fca4 100644
--- a/components/PROC/Release-1.0.0/openehr_proc_task_planning_100.bmm
+++ b/components/PROC/Release-1.0.0/openehr_proc_task_planning_100.bmm
@@ -222,21 +222,30 @@ class_definitions = <
 				name = <"expressions">
 				type_def = <
 					container_type = <"List">
-					type = <"CONTEXT_EXPRESSION">
+                    type_def = (P_BMM_GENERIC_TYPE) <
+                        root_type = <"CONTEXT_EXPRESSION">
+                        generic_parameters = <"EXPR_TYPE_DEF">
+                    >
 				>
 			>
 			["variables"] = (P_BMM_CONTAINER_PROPERTY) <
 				name = <"variables">
 				type_def = <
 					container_type = <"List">
-					type = <"CONTEXT_VARIABLE">
+                    type_def = (P_BMM_GENERIC_TYPE) <
+                        root_type = <"CONTEXT_VARIABLE">
+                        generic_parameters = <"EXPR_TYPE_DEF">
+                    >
 				>
 			>
 			["constants"] = (P_BMM_CONTAINER_PROPERTY) <
 				name = <"constants">
 				type_def = <
 					container_type = <"List">
-					type = <"CONTEXT_CONSTANT">
+                    type_def = (P_BMM_GENERIC_TYPE) <
+                        root_type = <"CONTEXT_CONSTANT">
+                        generic_parameters = <"EXPR_TYPE_DEF">
+                    >
 				>
 			>
 		>
@@ -435,7 +444,10 @@ class_definitions = <
 				name = <"event_wait_states">
 				type_def = <
 					container_type = <"List">
-					type = <"EVENT_WAIT">
+                    type_def = (P_BMM_GENERIC_TYPE) <
+                        root_type = <"EVENT_WAIT">
+                        generic_parameters = <"EVENT">
+                    >
 				>
 			>
 			["top_level_plans"] = (P_BMM_CONTAINER_PROPERTY) <
diff --git a/components/RM/Release-1.0.3/openehr_ehr_extract_103.bmm b/components/RM/Release-1.0.3/openehr_ehr_extract_103.bmm
index a0d0eb9..b0f0c90 100644
--- a/components/RM/Release-1.0.3/openehr_ehr_extract_103.bmm
+++ b/components/RM/Release-1.0.3/openehr_ehr_extract_103.bmm
@@ -552,7 +552,10 @@ class_definitions = <
 			["versions"] = (P_BMM_CONTAINER_PROPERTY) <
 				name = <"versions">
 				type_def = <
-					type = <"ORIGINAL_VERSION">
+                    type_def = (P_BMM_GENERIC_TYPE) <
+                        root_type = <"ORIGINAL_VERSION">
+                        generic_parameters = <"T">
+                    >
 					container_type = <"List">
 				>
 				cardinality = <|>=0|>
diff --git a/components/RM/Release-1.0.3/openehr_structures_103.bmm b/components/RM/Release-1.0.3/openehr_structures_103.bmm
index e58cf3f..e0b6edb 100644
--- a/components/RM/Release-1.0.3/openehr_structures_103.bmm
+++ b/components/RM/Release-1.0.3/openehr_structures_103.bmm
@@ -256,7 +256,10 @@ class_definitions = <
 				name = <"events">
 				type_def = <
 					container_type = <"List">
-					type = <"EVENT">
+					type_def = (P_BMM_GENERIC_TYPE) <
+                        root_type = <"EVENT">
+                        generic_parameters = <"T">
+                    >
 				>
 				cardinality = <|>=1|>
 			>
diff --git a/components/RM/rejected/openehr_ehr_extract_999.bmm b/components/RM/rejected/openehr_ehr_extract_999.bmm
index f1f2a42..6a95e46 100644
--- a/components/RM/rejected/openehr_ehr_extract_999.bmm
+++ b/components/RM/rejected/openehr_ehr_extract_999.bmm
@@ -721,7 +721,10 @@ class_definitions = <
 			["versions"] = (P_BMM_CONTAINER_PROPERTY) <
 				name = <"versions">
 				type_def = <
-					type = <"ORIGINAL_VERSION">
+					type_def = (P_BMM_GENERIC_TYPE) <
+                        root_type = <"ORIGINAL_VERSION">
+                        generic_parameters = <"T">
+                    >
 					container_type = <"List">
 				>
 				cardinality = <|>=0|>